Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""

This reverts commit e07e7bc9e7.

Contributes to issue CURA-4414.
This commit is contained in:
Ghostkeeper 2017-10-05 10:58:49 +02:00
parent ff41b043b1
commit d458fcde5c
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
12 changed files with 75 additions and 13 deletions

View file

@ -1405,6 +1405,28 @@
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"infill_offset_x":
{
"label": "Infill X Offset",
"description": "The infill pattern is offset this distance along the X axis.",
"unit": "mm",
"type": "float",
"default_value": 0,
"enabled": "infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"infill_offset_y":
{
"label": "Infill Y Offset",
"description": "The infill pattern is offset this distance along the Y axis.",
"unit": "mm",
"type": "float",
"default_value": 0,
"enabled": "infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"sub_div_rad_add":
{
"label": "Cubic Subdivision Shell",
@ -3986,7 +4008,7 @@
"skirt_gap":
{
"label": "Skirt Distance",
"description": "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance, multiple skirt lines will extend outwards from this distance.",
"description": "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance.",
"unit": "mm",
"type": "float",
"default_value": 3,