GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 03:35:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PP-1-Improved_print_profiles

Browse Source 
# Conflicts:
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
This commit is contained in:
p.kuiper 2021-09-29 17:33:02 +02:00
commit f9f59d0da1
4026 changed files with 4374 additions and 4056 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/CuraApplication.py
View File

@ -129,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 = 17
SettingVersion = 19
Created = False

4
cura/Settings/ContainerManager.py
View File

@ -23,6 +23,8 @@ from UM.Settings.InstanceContainer import InstanceContainer
import cura.CuraApplication
from cura.Machines.ContainerTree import ContainerTree
from cura.Settings.ExtruderStack import ExtruderStack
from cura.Settings.GlobalStack import GlobalStack
if TYPE_CHECKING:
from cura.CuraApplication import CuraApplication
@ -408,7 +410,7 @@ class ContainerManager(QObject):
container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry()
for plugin_id, container_type in container_registry.getContainerTypes():
# Ignore default container types since those are not plugins
if container_type in (InstanceContainer, ContainerStack, DefinitionContainer):
if container_type in (InstanceContainer, ContainerStack, DefinitionContainer, GlobalStack, ExtruderStack):
continue
serialize_type = ""

2
plugins/CuraEngineBackend/CuraEngineBackend.py
View File

@ -428,6 +428,7 @@ class CuraEngineBackend(QObject, Backend):
"Unable to slice with the current settings. The following settings have errors: {0}").format(", ".join(error_labels)),
title = catalog.i18nc("@info:title", "Unable to slice"),
message_type = Message.MessageType.WARNING)
Logger.warning(f"Unable to slice with the current settings. The following settings have errors: {', '.join(error_labels)}")
self._error_message.show()
self.setState(BackendState.Error)
self.backendError.emit(job)
@ -454,6 +455,7 @@ class CuraEngineBackend(QObject, Backend):
"Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}").format(error_labels = ", ".join(errors.values())),
title = catalog.i18nc("@info:title", "Unable to slice"),
message_type = Message.MessageType.WARNING)
Logger.warning(f"Unable to slice due to per-object settings. The following settings have errors on one or more models: {', '.join(errors.values())}")
self._error_message.show()
self.setState(BackendState.Error)
self.backendError.emit(job)

19
plugins/CuraEngineBackend/StartSliceJob.py
View File

@ -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
@ -353,10 +353,19 @@ class StartSliceJob(Job):
result[key] = stack.getProperty(key, "value")
Job.yieldThread()
result["print_bed_temperature"] = result["material_bed_temperature"] # Renamed settings.
# Material identification in addition to non-human-readable GUID
result["material_id"] = stack.material.getMetaDataEntry("base_file", "")
result["material_type"] = stack.material.getMetaDataEntry("material", "")
result["material_name"] = stack.material.getMetaDataEntry("name", "")
result["material_brand"] = stack.material.getMetaDataEntry("brand", "")
# Renamed settings.
result["print_bed_temperature"] = result["material_bed_temperature"]
result["print_temperature"] = result["material_print_temperature"]
result["travel_speed"] = result["speed_travel"]
result["time"] = time.strftime("%H:%M:%S") #Some extra settings.
#Some extra settings.
result["time"] = time.strftime("%H:%M:%S")
result["date"] = time.strftime("%d-%m-%Y")
result["day"] = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][int(time.strftime("%w"))]
result["initial_extruder_nr"] = CuraApplication.getInstance().getExtruderManager().getInitialExtruderNr()
@ -455,9 +464,9 @@ class StartSliceJob(Job):
bed_temperature_settings = ["material_bed_temperature", "material_bed_temperature_layer_0"]
pattern = r"\{(%s)(,\s?\w+)?\}" % "|".join(bed_temperature_settings) # match {setting} as well as {setting, extruder_nr}
settings["material_bed_temp_prepend"] = re.search(pattern, start_gcode) == None
print_temperature_settings = ["material_print_temperature", "material_print_temperature_layer_0", "default_material_print_temperature", "material_initial_print_temperature", "material_final_print_temperature", "material_standby_temperature"]
print_temperature_settings = ["material_print_temperature", "material_print_temperature_layer_0", "default_material_print_temperature", "material_initial_print_temperature", "material_final_print_temperature", "material_standby_temperature", "print_temperature"]
pattern = r"\{(%s)(,\s?\w+)?\}" % "|".join(print_temperature_settings) # match {setting} as well as {setting, extruder_nr}
settings["material_print_temp_prepend"] = re.search(pattern, start_gcode) == None
settings["material_print_temp_prepend"] = re.search(pattern, start_gcode) is None
# Replace the setting tokens in start and end g-code.
# Use values from the first used extruder by default so we get the expected temperatures

48
plugins/PostProcessingPlugin/scripts/FilamentChange.py
View File

@ -7,6 +7,8 @@
from typing import List
from ..Script import Script
from UM.Application import Application #To get the current printer's settings.
class FilamentChange(Script):
_layer_keyword = ";LAYER:"
@ -81,10 +83,51 @@ class FilamentChange(Script):
"type": "float",
"default_value": 0,
"minimum_value": 0
},
"retract_method":
{
"label": "Retract method",
"description": "The gcode variant to use for retract.",
"type": "enum",
"options": {"U": "Marlin (M600 U)", "L": "Reprap (M600 L)"},
"default_value": "U",
"value": "\\\"L\\\" if machine_gcode_flavor==\\\"RepRap (RepRap)\\\" else \\\"U\\\"",
"enabled": "not firmware_config"
},
"machine_gcode_flavor":
{
"label": "G-code flavor",
"description": "The type of g-code to be generated. This setting is controlled by the script and will not be visible.",
"type": "enum",
"options":
{
"RepRap (Marlin/Sprinter)": "Marlin",
"RepRap (Volumetric)": "Marlin (Volumetric)",
"RepRap (RepRap)": "RepRap",
"UltiGCode": "Ultimaker 2",
"Griffin": "Griffin",
"Makerbot": "Makerbot",
"BFB": "Bits from Bytes",
"MACH3": "Mach3",
"Repetier": "Repetier"
},
"default_value": "RepRap (Marlin/Sprinter)",
"enabled": "false"
}
}
}"""
## Copy machine name and gcode flavor from global stack so we can use their value in the script stack
def initialize(self) -> None:
super().initialize()
global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack is None or self._instance is None:
return
for key in ["machine_gcode_flavor"]:
self._instance.setProperty(key, "value", global_container_stack.getProperty(key, "value"))
def execute(self, data: List[str]):
"""Inserts the filament change g-code at specific layer numbers.
@ -106,7 +149,10 @@ class FilamentChange(Script):
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)
# Reprap uses 'L': https://reprap.org/wiki/G-code#M600:_Filament_change_pause
# Marlin uses 'U' https://marlinfw.org/docs/gcode/M600.html
retract_method = self.getSettingValueByKey("retract_method")
color_change = color_change + (" %s%.2f" % (retract_method, later_retract))
if x_pos is not None:
color_change = color_change + (" X%.2f" % x_pos)

10
plugins/Toolbox/src/Toolbox.py
View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 Ultimaker B.V.
# Copyright (c) 2021 Ultimaker B.V.
# Toolbox is released under the terms of the LGPLv3 or higher.
import json
@ -542,7 +542,7 @@ class Toolbox(QObject, Extension):
# Make API Calls
# --------------------------------------------------------------------------
def _makeRequestByType(self, request_type: str) -> None:
Logger.log("d", "Requesting [%s] metadata from server.", request_type)
Logger.debug(f"Requesting {request_type} metadata from server.")
url = self._request_urls[request_type]
callback = lambda r, rt = request_type: self._onDataRequestFinished(rt, r)
@ -554,7 +554,7 @@ class Toolbox(QObject, Extension):
@pyqtSlot(str)
def startDownload(self, url: str) -> None:
Logger.log("i", "Attempting to download & install package from %s.", url)
Logger.info(f"Attempting to download & install package from {url}.")
callback = lambda r: self._onDownloadFinished(r)
error_callback = lambda r, e: self._onDownloadFailed(r, e)
@ -572,7 +572,7 @@ class Toolbox(QObject, Extension):
@pyqtSlot()
def cancelDownload(self) -> None:
Logger.log("i", "User cancelled the download of a package. request %s", self._download_request_data)
Logger.info(f"User cancelled the download of a package. request {self._download_request_data}")
if self._download_request_data is not None:
self._application.getHttpRequestManager().abortRequest(self._download_request_data)
self._download_request_data = None
@ -585,7 +585,7 @@ class Toolbox(QObject, Extension):
# Handlers for Network Events
# --------------------------------------------------------------------------
def _onDataRequestError(self, request_type: str, reply: "QNetworkReply", error: "QNetworkReply.NetworkError") -> None:
Logger.log("e", "Request [%s] failed due to error [%s]: %s", request_type, error, reply.errorString())
Logger.error(f"Request {request_type} failed due to error {error}: {reply.errorString()}")
self.setViewPage("errored")
def _onDataRequestFinished(self, request_type: str, reply: "QNetworkReply") -> None:

114
plugins/VersionUpgrade/VersionUpgrade411to412/VersionUpgrade411to412.py Normal file
View File

@ -0,0 +1,114 @@
# Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import configparser
import io
import os.path
from typing import List, Tuple
from UM.VersionUpgrade import VersionUpgrade
class VersionUpgrade411to412(VersionUpgrade):
"""
Upgrades configurations from the state they were in at version 4.11 to the
state they should be in at version 4.12.
"""
_flsun_profile_mapping = {
"extra_coarse": "flsun_sr_normal",
"coarse": "flsun_sr_normal",
"extra_fast": "flsun_sr_normal",
"draft": "flsun_sr_normal",
"fast": "flsun_sr_normal",
"normal": "flsun_sr_normal",
"high": "flsun_sr_fine"
}
_flsun_quality_type_mapping = {
"extra coarse": "normal",
"coarse" : "normal",
"verydraft" : "normal",
"draft" : "normal",
"fast" : "normal",
"normal" : "normal",
"high" : "fine"
}
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["metadata"]["setting_version"] = "19"
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]
def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
"""
Upgrades instance containers to have the new version number.
:param serialized: The original contents of the instance container.
:param filename: The file name of the instance container.
:return: A list of file names, and a list of the new contents for those
files.
"""
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"] = "19"
# Update user-made quality profiles of flsun_sr printers to use the flsun_sr-specific qualities instead of the
# global ones as their base
file_base_name = os.path.basename(filename) # Remove any path-related characters from the filename
if file_base_name.startswith("flsun_sr_") and parser["metadata"].get("type") == "quality_changes":
if "general" in parser and parser["general"].get("definition") == "fdmprinter":
old_quality_type = parser["metadata"].get("quality_type", "normal")
parser["general"]["definition"] = "flsun_sr"
parser["metadata"]["quality_type"] = self._flsun_quality_type_mapping.get(old_quality_type, "normal")
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]
def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
"""
Upgrades container stacks to have the new version number.
Upgrades container stacks for FLSun Racer to change their profiles.
:param serialized: The original contents of the container stack.
:param filename: The file name of the container stack.
:return: A list of file names, and a list of the new contents for those
files.
"""
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialized)
# Update setting version number.
if "metadata" not in parser:
parser["metadata"] = {}
parser["metadata"]["setting_version"] = "19"
# Change renamed profiles.
if "containers" in parser:
definition_id = parser["containers"].get("7")
if definition_id == "flsun_sr":
if parser["metadata"].get("type", "machine") == "machine": # Only global stacks.
old_quality = parser["containers"].get("3")
new_quality = self._flsun_profile_mapping.get(old_quality, "flsun_sr_normal")
parser["containers"]["3"] = new_quality
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]

56
plugins/VersionUpgrade/VersionUpgrade411to412/__init__.py Normal file
View File

@ -0,0 +1,56 @@
# Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from typing import Any, Dict, TYPE_CHECKING
from . import VersionUpgrade411to412
if TYPE_CHECKING:
from UM.Application import Application
upgrade = VersionUpgrade411to412.VersionUpgrade411to412()
def getMetaData() -> Dict[str, Any]:
return {
"version_upgrade": {
# From To Upgrade function
("machine_stack", 5000017): ("machine_stack", 5000019, upgrade.upgradeStack),
("extruder_train", 5000017): ("extruder_train", 5000019, upgrade.upgradeStack),
("definition_changes", 4000017): ("definition_changes", 4000019, upgrade.upgradeInstanceContainer),
("quality_changes", 4000017): ("quality_changes", 4000019, upgrade.upgradeInstanceContainer),
("quality", 4000017): ("quality", 4000019, upgrade.upgradeInstanceContainer),
("user", 4000017): ("user", 4000019, upgrade.upgradeInstanceContainer),
("preferences", 7000017): ("preferences", 7000019, upgrade.upgradePreferences),
},
"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}

8
plugins/VersionUpgrade/VersionUpgrade411to412/plugin.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Version Upgrade 4.11 to 4.12",
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.11 to Cura 4.12.",
"api": 7,
"i18n-catalog": "cura"
}

38
requirements.txt
View File

@ -1,36 +1,38 @@
cffi==1.14.1
colorlog
cryptography==3.4.6
importlib-metadata==3.7.2
mypy==0.740
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.14.1
chardet==3.0.4
colorlog
comtypes==1.1.7
cryptography==3.4.8
decorator==4.4.0
idna==2.8
importlib-metadata==3.7.2
keyring==23.0.1
lxml==4.6.3
mypy==0.740
netifaces==0.10.9
networkx==2.3
networkx==2.6.2
numpy==1.20.2
numpy-stl==2.10.1
packaging==18.0
pycollada==0.6
pycparser==2.19
pycparser==2.20
pyparsing==2.4.2
PyQt5==5.15.2
PyQt5-sip==12.8.1
pyserial==3.4
pytest
python-dateutil==2.8.0
python-utils==2.3.0
pywin32==301
requests==2.22.0
scipy==1.6.2
sentry-sdk==0.13.5
shapely[vectorized]==1.7.1
six==1.12.0
trimesh==3.2.33
zeroconf==0.24.1
comtypes==1.1.7
pywin32==300
keyring==23.0.1
twisted==21.2.0
typing
urllib3==1.25.9
zeroconf==0.31.0

18
resources/bundled_packages/cura.json
View File

@ -986,6 +986,24 @@
}
}
},
"VersionUpgrade411to412": {
"package_info": {
"package_id": "VersionUpgrade411to412",
"package_type": "plugin",
"display_name": "Version Upgrade 4.11 to 4.12",
"description": "Upgrades configurations from Cura 4.11 to Cura 4.12",
"package_version": "1.0.0",
"sdk_version": 7,
"sdk_version_semver": "7.7.0",
"website": "https://ultimaker.com",
"author": {
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
}
}
},
"X3DReader": {
"package_info": {
"package_id": "X3DReader",

2
resources/definitions/anycubic_mega_zero.def.json
View File

@ -92,7 +92,7 @@
"retraction_hop_enabled": { "value": "True" },
"retraction_hop": { "value": 0.2 },
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_combing_max_distance": { "value": 30 },
"travel_avoid_other_parts": { "value": true },

2
resources/definitions/atmat_signal_pro_base.def.json
View File

@ -225,7 +225,7 @@
"retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": "130" },
"retraction_hop_enabled": { "value": "True" },
"retraction_hop": { "value": "0.5" },
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_combing_max_distance": { "value": "10" },
"travel_avoid_other_parts": { "value": "True" },
"travel_avoid_supports": { "value": "True" },

1
resources/definitions/blv_mgn_cube_300.def.json
View File

@ -4,7 +4,6 @@
"inherits": "blv_mgn_cube_base",
"metadata": {
"visible": true,
"setting_version": 17,
"author": "wolfgangmauer",
"manufacturer": "BLV",
"file_formats": "text/x-gcode",

1
resources/definitions/blv_mgn_cube_350.def.json
View File

@ -4,7 +4,6 @@
"inherits": "blv_mgn_cube_base",
"metadata": {
"visible": true,
"setting_version": 17,
"author": "wolfgangmauer",
"manufacturer": "BLV",
"file_formats": "text/x-gcode",

1
resources/definitions/creality_ender5plus.def.json
View File

@ -5,6 +5,7 @@
"overrides": {
"machine_name": { "default_value": "Creality Ender-5 Plus" },
"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\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\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 positioning\n\nG1 X{machine_width} 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_width": { "default_value": 350 },
"machine_depth": { "default_value": 350 },
"machine_height": { "default_value": 400 },

2
resources/definitions/creatable_d3.def.json
View File

@ -27,7 +27,7 @@
"gantry_height": {"value": "43"},
"layer_height": { "default_value": 0.1 },
"relative_extrusion": { "value": "False" },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop_only_when_collides": { "default_value": false },
"retraction_speed": { "default_value": 100 },

2
resources/definitions/deltacomb_base.def.json
View File

@ -64,7 +64,7 @@
"retraction_hop": { "default_value": 1.0 },
"retraction_amount" : { "default_value": 3.5 },
"retraction_speed" : { "default_value": 40 },
"retraction_combing" : { "default_value": "noskin" },
"retraction_combing" : { "value": "'noskin'" },
"travel_avoid_distance": { "value": "1" },
"travel_avoid_supports": { "value": "True" },
"retraction_hop_only_when_collides": { "value": "1" },

12
resources/definitions/eryone_thinker.def.json
View File

@ -12,7 +12,7 @@
"platform_texture": "eryone_thinker_plate.png",
"platform_offset": [0, -120, 0],
"has_materials": true,
"preferred_material": "generic_pla",
"preferred_material": "eryone_pla",
"has_machine_quality": true,
"preferred_quality_type": "normal",
"machine_extruder_trains":
@ -57,10 +57,10 @@
"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..."
"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\nM413 S1 ;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"
"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 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
@ -160,7 +160,7 @@
"value": 10
},
"skirt_brim_speed": {
"value": 40
"value": "math.ceil(speed_print * 40 / 60)"
},
"skirt_gap": {
"value": 5
@ -229,7 +229,7 @@
"value": 3
},
"wall_thickness": {
"value": "1.2"
"value": "line_width * wall_line_count"
},
"bottom_layers": {
"value": "4"
@ -250,4 +250,4 @@
"value": "'z_seam_corner_inner'"
}
}
}
}

2
resources/definitions/fdmextruder.def.json
View File

@ -6,7 +6,7 @@
"type": "extruder",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 17,
"setting_version": 19,
"visible": false,
"position": "0"
},

6
resources/definitions/fdmprinter.def.json
View File

@ -6,7 +6,7 @@
"type": "machine",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 17,
"setting_version": 19,
"file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
@ -3850,11 +3850,13 @@
{
"off": "Off",
"all": "All",
"no_outer_surfaces": "Not on Outer Surface",
"noskin": "Not in Skin",
"infill": "Within Infill"
},
"default_value": "all",
"resolve": "'noskin' if 'noskin' in extruderValues('retraction_combing') else ('infill' if 'infill' in extruderValues('retraction_combing') else ('all' if 'all' in extruderValues('retraction_combing') else 'off'))",
"value": "'no_outer_surfaces' if (any(extruderValues('skin_monotonic')) or any(extruderValues('ironing_enabled')) or (any(extruderValues('roofing_monotonic')) and any(extruderValues('roofing_layer_count')))) else 'all'",
"resolve": "'noskin' if 'noskin' in extruderValues('retraction_combing') else ('infill' if 'infill' in extruderValues('retraction_combing') else ('all' if 'all' in extruderValues('retraction_combing') else ('no_outer_surfaces' if 'no_outer_surfaces' in extruderValues('retraction_combing') else 'off')))",
"settable_per_mesh": false,
"settable_per_extruder": false
},

5
resources/definitions/hellbot_magna_2_230_dual.def.json
View File

@ -39,11 +39,10 @@
"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"
},
"default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \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"
}
}
}

5
resources/definitions/hellbot_magna_2_300_dual.def.json
View File

@ -39,11 +39,10 @@
"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"
},
"default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \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"
}
}
}

2
resources/definitions/inat_base.def.json
View File

@ -369,7 +369,7 @@
"value": 45
},
"retraction_combing": {
"value": "infill"
"value": "'infill'"
},
"retraction_hop_enabled": {
"value": true

2
resources/definitions/julia.def.json
View File

@ -30,7 +30,7 @@
"support_pattern": { "default_value": "grid" },
"infill_sparse_density": { "default_value": 10 },
"machine_extruder_count": { "default_value": 1 },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_height": { "default_value": 260 },

2
resources/definitions/leapfrog_bolt_pro.def.json
View File

@ -97,7 +97,7 @@
"material_final_print_temperature": {"value": "default_material_print_temperature" },
"material_initial_print_temperature": {"value": "default_material_print_temperature" },
"gantry_height": {"value": "20"},
"retraction_combing": { "default_value": "all" },
"retraction_combing": { "value": "'all'" },
"retraction_amount": {"default_value": 2},
"adhesion_type": {"default_value": "skirt"},
"skirt_line_count": {"default_value": 3},

2
resources/definitions/liquid.def.json
View File

@ -172,7 +172,7 @@
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 100" },
"meshfix_maximum_deviation": { "value": "layer_height / 4" },
"optimize_wall_printing_order": { "value": "True" },
"retraction_combing": { "default_value": "all" },
"retraction_combing": { "value": "'all'" },
"initial_layer_line_width_factor": { "value": "120" },
"zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
}

2
resources/definitions/maker_made_300x.def.json
View File

@ -101,7 +101,7 @@
"acceleration_enabled": {"value": false },
"acceleration_roofing": {"value": 3000 },
"jerk_enabled": {"value": false },
"retraction_combing": {"value": "'within infill'" },
"retraction_combing": {"value": "'infill'" },
"travel_retract_before_outer_wall": {"value": false },
"travel_avoid_other_parts": {"value": true },
"retraction_hop_enabled": {"value": false },

2
resources/definitions/malyan_m200.def.json
View File

@ -76,7 +76,7 @@
"raft_surface_layers": { "default_value": 1 },
"skirt_line_count": { "default_value": 2},
"brim_width" : { "default_value": 5},
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_amount" : { "default_value": 4.5},
"retraction_speed" : { "default_value": 40},
"coasting_enable": { "default_value": true },

2
resources/definitions/monoprice_select_mini_v2.def.json
View File

@ -23,7 +23,7 @@
"default_value": "G0 X0 Y120;(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.)"
},
"adhesion_type": { "default_value": "brim" },
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_amount" : { "default_value": 2.5},
"retraction_speed" : { "default_value": 40},
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }

2
resources/definitions/renkforce_rf100.def.json
View File

@ -153,7 +153,7 @@
"value": "5.0"
},
"retraction_combing": {
"default_value": "all"
"value": "'all'"
},
"retraction_enable": {
"value": "True"

2
resources/definitions/renkforce_rf100_v2.def.json
View File

@ -153,7 +153,7 @@
"value": "5.0"
},
"retraction_combing": {
"default_value": "all"
"value": "'all'"
},
"retraction_enable": {
"value": "True"

2
resources/definitions/renkforce_rf100_xl.def.json
View File

@ -141,7 +141,7 @@
"value": "5.0"
},
"retraction_combing": {
"default_value": "all"
"value": "'all'"
},
"retraction_enable": {
"value": "True"

2
resources/definitions/robo_3d_r1.def.json
View File

@ -36,7 +36,7 @@
"layer_height": { "default_value": 0.2 },
"speed_print": { "default_value": 40 },
"machine_extruder_count": { "default_value": 1 },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_height": { "default_value": 210 },

2
resources/definitions/seemecnc_artemis.def.json
View File

@ -29,7 +29,7 @@
"machine_width": { "default_value": 290 },
"relative_extrusion": { "value": "False" },
"retraction_amount": { "default_value": 3.2 },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop_only_when_collides": { "default_value": false },
"retraction_speed": { "default_value": 45 },

2
resources/definitions/seemecnc_v32.def.json
View File

@ -29,7 +29,7 @@
"machine_width": { "default_value": 265 },
"relative_extrusion": { "value": "False" },
"retraction_amount": { "default_value": 3.2 },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop_only_when_collides": { "default_value": false },
"retraction_speed": { "default_value": 45 },

2
resources/definitions/skriware_2.def.json
View File

@ -417,7 +417,7 @@
"value": "1"
},
"retraction_combing": {
"default_value": "infill"
"value": "'infill'"
},
"acceleration_prime_tower": {
"value": "250"

2
resources/definitions/strateo3d.def.json
View File

@ -116,7 +116,7 @@
"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" },
"retraction_combing": { "value": "'all'" },
"retraction_combing_max_distance": { "default_value": 5 },
"retraction_count_max": { "default_value": 15 },
"retraction_hop": { "value": "2" },

2
resources/definitions/tizyx_evy.def.json
View File

@ -70,6 +70,6 @@
"z_seam_type": {"default_value": "back"},
"z_seam_x": {"value": "127.5"},
"z_seam_y": {"value": "250"},
"retraction_combing": {"default_value": "off"}
"retraction_combing": {"value": "'off'"}
}
}

2
resources/definitions/tizyx_evy_dual.def.json
View File

@ -58,6 +58,6 @@
"z_seam_type": {"default_value": "back"},
"z_seam_x": {"value": "127.5"},
"z_seam_y": {"value": "250"},
"retraction_combing": {"default_value": "off"}
"retraction_combing": {"value": "'off'"}
}
}

2
resources/definitions/tizyx_k25.def.json
View File

@ -55,6 +55,6 @@
"z_seam_type": {"default_value": "back"},
"z_seam_x": {"value": "127.5"},
"z_seam_y": {"value": "250"},
"retraction_combing": {"default_value": "off"}
"retraction_combing": {"value": "'off'"}
}
}

3
resources/definitions/ultimaker_s3.def.json
View File

@ -93,8 +93,7 @@
"infill_overlap": { "value": "0" },
"infill_pattern": { "value": "'lines'" },
"infill_wipe_dist": { "value": "0" },
"infill_before_walls": { "value": false },
"jerk_enabled": { "value": "True" },
"jerk_enabled": { "value": "False" },
"jerk_layer_0": { "value": "jerk_topbottom" },
"jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
"jerk_print": { "value": "25" },

2
resources/definitions/ultimaker_s5.def.json
View File

@ -95,7 +95,7 @@
"infill_overlap": { "value": "0" },
"infill_pattern": { "value": "'lines'" },
"infill_wipe_dist": { "value": "0" },
"infill_before_walls": { "value": false },
"infill_before_walls": { "value": "False" },
"jerk_enabled": { "value": "True" },
"jerk_layer_0": { "value": "jerk_topbottom" },
"jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },

2
resources/definitions/voron2_base.def.json
View File

@ -104,7 +104,7 @@
"retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop": { "default_value": 0.2 },
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_combing_max_distance": { "default_value": 10 },
"travel_avoid_other_parts": { "default_value": false },
"speed_travel": { "maximum_value": 300, "value": 300, "maximum_value_warning": 501 },

8
resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json
View File

@ -13,6 +13,12 @@
"maximum_value": "1"
},
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code": {
"default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}"
},
"machine_extruder_end_code": {
"default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90"
}
}
}

8
resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json
View File

@ -13,6 +13,12 @@
"maximum_value": "1"
},
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code": {
"default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}"
},
"machine_extruder_end_code": {
"default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90"
}
}
}

8
resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json
View File

@ -13,6 +13,12 @@
"maximum_value": "1"
},
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code": {
"default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}"
},
"machine_extruder_end_code": {
"default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90"
}
}
}

8
resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json
View File

@ -13,6 +13,12 @@
"maximum_value": "1"
},
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code": {
"default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}"
},
"machine_extruder_end_code": {
"default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90"
}
}
}

2
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D010
intent_category = engineering

2
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D015
intent_category = engineering

2
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = engineering

2
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = quick

2
resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D030
intent_category = quick

2
resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_B.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D010
intent_category = engineering

2
resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_C.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D015
intent_category = engineering

2
resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = engineering

2
resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = quick

2
resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D030
intent_category = quick

2
resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_B.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D010
intent_category = engineering

2
resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_C.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D015
intent_category = engineering

2
resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = engineering

2
resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = quick

2
resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = quick

2
resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D030
intent_category = quick

2
resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_B.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D010
intent_category = engineering

2
resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_C.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D015
intent_category = engineering

2
resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = engineering

2
resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D015
intent_category = quick

2
resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = quick

2
resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D030
intent_category = quick

2
resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_B.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D010
intent_category = engineering

2
resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_C.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D015
intent_category = engineering

2
resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = engineering

2
resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = quick

2
resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D030
intent_category = quick

2
resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_B.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D010
intent_category = engineering

2
resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_C.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D015
intent_category = engineering

2
resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = engineering

2
resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D020
intent_category = quick

2
resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = deltacomb_base
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = D030
intent_category = quick

2
resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = quick
quality_type = draft

2
resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = fast

2
resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg
View File

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = fast
intent_category = visual

2
resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg
View File

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = high
intent_category = visual

2
resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = normal

2
resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg
View File

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = normal
intent_category = visual

2
resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = fast

2
resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = normal

2
resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = fast

2
resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = normal

2
resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = fast

2
resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = normal

2
resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = quick
quality_type = draft

2
resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = fast

2
resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg
View File

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = fast
intent_category = visual

2
resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg
View File

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = high
intent_category = visual

2
resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = normal

2
resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg
View File

@ -4,7 +4,7 @@ name = Visual
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
quality_type = normal
intent_category = visual

2
resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg
View File

@ -4,7 +4,7 @@ name = Quick
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = quick
quality_type = draft

2
resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg
View File

@ -4,7 +4,7 @@ name = Accurate
definition = liquid
[metadata]
setting_version = 17
setting_version = 19
type = intent
intent_category = engineering
quality_type = fast

Some files were not shown because too many files have changed in this diff Show More