diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2022-05-16 16:11:39 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2022-05-16 16:11:39 +0300 |
| commit | fc4585e098e0ab691f902b2b0c88193cf0a292f6 (patch) | |
| tree | 7b15779379eae3fca90e9a2a4c45c5ae7d2d6a83 /resources/definitions | |
| parent | 9a5a99da46ec908f819574b2dafc0c213ff0af69 (diff) | |
| parent | 94fc3981a378a6835deab526031ecd7aea60cdf0 (diff) | |
Merge branch '5.0'
Conflicts:
plugins/Marketplace/resources/qml/PackageCardHeader.qml -> An improvement for future translations was made at the same time as a change to the label here.
Diffstat (limited to 'resources/definitions')
| -rw-r--r-- | resources/definitions/ultimaker2_plus_connect.def.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 1effa1616f..8ccbd7f380 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -81,7 +81,7 @@ "material_bed_temperature_layer_0": { "maximum_value": 110 }, "material_print_temperature": { "maximum_value": 260 }, "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, - "meshfix_maximum_deviation": { "value": "layer_height / 4" }, + "meshfix_maximum_deviation": { "value": "(layer_height / 3) if magic_spiralize else (layer_height / 4)" }, "meshfix_maximum_travel_resolution": { "value": 0.5 }, "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, "retraction_prime_speed": { "value": "15" }, |