mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-04-29 07:14:24 +08:00
Merge branch '4.8'
This commit is contained in:
commit
b6e5c3937b
@ -124,7 +124,7 @@
|
|||||||
"adaptive_layer_height_variation": { "value": 0.04 },
|
"adaptive_layer_height_variation": { "value": 0.04 },
|
||||||
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
||||||
|
|
||||||
"meshfix_maximum_resolution": { "value": "0.05" },
|
"meshfix_maximum_resolution": { "value": "0.25" },
|
||||||
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
||||||
|
|
||||||
"top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" },
|
"top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" },
|
||||||
|
@ -235,7 +235,7 @@
|
|||||||
"adaptive_layer_height_variation": { "value": 0.04 },
|
"adaptive_layer_height_variation": { "value": 0.04 },
|
||||||
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
||||||
|
|
||||||
"meshfix_maximum_resolution": { "value": "0.05" },
|
"meshfix_maximum_resolution": { "value": "0.25" },
|
||||||
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
||||||
|
|
||||||
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
|
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
|
||||||
|
@ -139,7 +139,7 @@
|
|||||||
"adaptive_layer_height_variation": { "value": 0.04 },
|
"adaptive_layer_height_variation": { "value": 0.04 },
|
||||||
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
||||||
|
|
||||||
"meshfix_maximum_resolution": { "value": "0.05" },
|
"meshfix_maximum_resolution": { "value": "0.25" },
|
||||||
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
||||||
|
|
||||||
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
|
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
|
||||||
|
@ -238,7 +238,7 @@
|
|||||||
"adaptive_layer_height_variation": { "value": 0.04 },
|
"adaptive_layer_height_variation": { "value": 0.04 },
|
||||||
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
||||||
|
|
||||||
"meshfix_maximum_resolution": { "value": "0.05" },
|
"meshfix_maximum_resolution": { "value": "0.25" },
|
||||||
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
||||||
|
|
||||||
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
|
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
|
||||||
|
@ -75,6 +75,6 @@
|
|||||||
"adhesion_type": { "default_value": "skirt" },
|
"adhesion_type": { "default_value": "skirt" },
|
||||||
"brim_outside_only": { "default_value": false },
|
"brim_outside_only": { "default_value": false },
|
||||||
|
|
||||||
"meshfix_maximum_resolution": { "default_value": 0.05 }
|
"meshfix_maximum_resolution": { "default_value": 0.25 }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -250,7 +250,7 @@
|
|||||||
"brim_replaces_support": { "value": false },
|
"brim_replaces_support": { "value": false },
|
||||||
"brim_gap": { "value": "line_width / 2 if line_width < 0.4 else 0.2" },
|
"brim_gap": { "value": "line_width / 2 if line_width < 0.4 else 0.2" },
|
||||||
|
|
||||||
"meshfix_maximum_resolution": { "value": 0.05 },
|
"meshfix_maximum_resolution": { "value": 0.25 },
|
||||||
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
||||||
|
|
||||||
"adaptive_layer_height_variation": { "value": 0.04 },
|
"adaptive_layer_height_variation": { "value": 0.04 },
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
"cool_fan_full_at_height":{ "value":"layer_height_0 + 2 * layer_height" },
|
"cool_fan_full_at_height":{ "value":"layer_height_0 + 2 * layer_height" },
|
||||||
"cool_fan_enabled":{ "value":true },
|
"cool_fan_enabled":{ "value":true },
|
||||||
"cool_min_layer_time":{ "value":10 },
|
"cool_min_layer_time":{ "value":10 },
|
||||||
"meshfix_maximum_resolution":{ "value":"0.05" },
|
"meshfix_maximum_resolution":{ "value":"0.25" },
|
||||||
"meshfix_maximum_travel_resolution":{ "value":"meshfix_maximum_resolution" },
|
"meshfix_maximum_travel_resolution":{ "value":"meshfix_maximum_resolution" },
|
||||||
"adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
|
"adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
|
||||||
"skirt_gap":{ "value":5.0 },
|
"skirt_gap":{ "value":5.0 },
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
"cool_fan_full_at_height":{ "value":"layer_height_0 + 2 * layer_height" },
|
"cool_fan_full_at_height":{ "value":"layer_height_0 + 2 * layer_height" },
|
||||||
"cool_fan_enabled":{ "value":true },
|
"cool_fan_enabled":{ "value":true },
|
||||||
"cool_min_layer_time":{ "value":10 },
|
"cool_min_layer_time":{ "value":10 },
|
||||||
"meshfix_maximum_resolution":{ "value":"0.05" },
|
"meshfix_maximum_resolution":{ "value":"0.25" },
|
||||||
"meshfix_maximum_travel_resolution":{ "value":"meshfix_maximum_resolution" },
|
"meshfix_maximum_travel_resolution":{ "value":"meshfix_maximum_resolution" },
|
||||||
"adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
|
"adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
|
||||||
"skirt_gap":{ "value":5.0 },
|
"skirt_gap":{ "value":5.0 },
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
"expand_skins_expand_distance":{"value":0.8},
|
"expand_skins_expand_distance":{"value":0.8},
|
||||||
"fill_outline_gaps":{"default_value":false},
|
"fill_outline_gaps":{"default_value":false},
|
||||||
"infill_sparse_density":{"value":15},
|
"infill_sparse_density":{"value":15},
|
||||||
"meshfix_maximum_resolution":{"value":0.05},
|
"meshfix_maximum_resolution":{"value":0.25},
|
||||||
"optimize_wall_printing_order":{"value":true},
|
"optimize_wall_printing_order":{"value":true},
|
||||||
"retract_at_layer_change":{"value":false},
|
"retract_at_layer_change":{"value":false},
|
||||||
"retraction_amount":{"value":4.5},
|
"retraction_amount":{"value":4.5},
|
||||||
|
@ -243,7 +243,7 @@
|
|||||||
"adaptive_layer_height_variation": { "value": 0.04 },
|
"adaptive_layer_height_variation": { "value": 0.04 },
|
||||||
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
||||||
|
|
||||||
"meshfix_maximum_resolution": { "value": "0.05" },
|
"meshfix_maximum_resolution": { "value": "0.25" },
|
||||||
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
||||||
|
|
||||||
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
|
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
|
||||||
|
@ -138,7 +138,7 @@
|
|||||||
"adaptive_layer_height_variation": { "value": 0.04 },
|
"adaptive_layer_height_variation": { "value": 0.04 },
|
||||||
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
"adaptive_layer_height_variation_step": { "value": 0.04 },
|
||||||
|
|
||||||
"meshfix_maximum_resolution": { "value": "0.05" },
|
"meshfix_maximum_resolution": { "value": "0.25" },
|
||||||
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
|
||||||
|
|
||||||
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
|
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
|
||||||
|
Loading…
x
Reference in New Issue
Block a user