GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 08:56:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into CURA-5675-reset_machines_for_removed_quality_changes

Browse Source
This commit is contained in:
Lipu Fei 2018-08-29 12:53:46 +02:00 committed by GitHub
commit ee8d45f8a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View File

@ -364,7 +364,6 @@ Cura.MachineAction
{ {
id: addressField id: addressField
width: parent.width width: parent.width
maximumLength: 40
validator: RegExpValidator validator: RegExpValidator
{ {
regExp: /[a-zA-Z0-9\.\-\_]*/ regExp: /[a-zA-Z0-9\.\-\_]*/

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

@ -1819,9 +1819,9 @@
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 0.1, "default_value": 0.1,
"minimum_value": "resolveOrValue('layer_height')", "minimum_value": "resolveOrValue('layer_height') if infill_line_distance > 0 else -999999",
"maximum_value_warning": "0.75 * machine_nozzle_size", "maximum_value_warning": "0.75 * machine_nozzle_size",
"maximum_value": "resolveOrValue('layer_height') * (1.45 if spaghetti_infill_enabled else 8)", "maximum_value": "resolveOrValue('layer_height') * (1.45 if spaghetti_infill_enabled else 8) if infill_line_distance > 0 else 999999",
"value": "resolveOrValue('layer_height')", "value": "resolveOrValue('layer_height')",
"enabled": "infill_sparse_density > 0 and not spaghetti_infill_enabled", "enabled": "infill_sparse_density > 0 and not spaghetti_infill_enabled",
"limit_to_extruder": "infill_extruder_nr", "limit_to_extruder": "infill_extruder_nr",