3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter

Browse source 
# Conflicts:
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
This commit is contained in:
c.lamboo 2023-03-15 12:50:29 +01:00
commit 61aff1756e
23 changed files with 250 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

19
resources/definitions/fdmprinter.def.json
View file

@ -4407,9 +4407,9 @@
"unit": "mm/s",
"type": "float",
"default_value": 10,
"enabled": "cool_min_layer_time > 0",
"minimum_value": "0",
"minimum_value": "1",
"maximum_value_warning": "100",
"enabled": "cool_min_layer_time > 0",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -5691,6 +5691,21 @@
"settable_per_mesh": false,
"settable_per_extruder": true
},
"skirt_height":
{
"label": "Skirt Height",
"description": "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt.",
"type": "int",
"default_value": 3,
"value": "3 if resolveOrValue('skirt_gap') > 0.0 else 1",
"minimum_value": "1",
"maximum_value_warning": "10",
"maximum_value": "machine_height / layer_height",
"enabled": "resolveOrValue('adhesion_type') == 'skirt'",
"limit_to_extruder": "skirt_brim_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"skirt_gap":
{
"label": "Skirt Distance",