mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-07 05:53:59 -06:00
Merge branch 'master' into feature_support_bottoms
This commit is contained in:
Tim Kuipers
commit
401e302ad5
43 changed files with 564 additions and 316 deletions
|
|
@ -150,6 +150,8 @@
|
|||
"label": "Number extruders",
|
||||
"description": "Number of extruder trains. An extruder train is the combination of a feeder, bowden tube, and nozzle.",
|
||||
"default_value": 1,
|
||||
"minimum_value": "1",
|
||||
"maximum_value": "16",
|
||||
"type": "int",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
|
|
@ -1064,6 +1066,7 @@
|
|||
"unit": "[[mm³,°C]]",
|
||||
"type": "str",
|
||||
"default_value": "[[3.5,200],[7.0,240]]",
|
||||
"enabled": "False",
|
||||
"comments": "old enabled function: material_flow_dependent_temperature",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
|
|
@ -1236,30 +1239,28 @@
|
|||
"default_value": false,
|
||||
"enabled": "retraction_enable",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"children": {
|
||||
"retraction_hop_only_when_collides": {
|
||||
"label": "Z Hop Only Over Printed Parts",
|
||||
"description": "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling.",
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"enabled": "retraction_enable and retraction_hop_enabled and travel_avoid_other_parts",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"retraction_hop": {
|
||||
"label": "Z Hop Height",
|
||||
"description": "The height difference when performing a Z Hop.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"minimum_value_warning": "-0.0001",
|
||||
"maximum_value_warning": "10",
|
||||
"enabled": "retraction_enable and retraction_hop_enabled",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
}
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"retraction_hop_only_when_collides": {
|
||||
"label": "Z Hop Only Over Printed Parts",
|
||||
"description": "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling.",
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"enabled": "retraction_enable and retraction_hop_enabled and travel_avoid_other_parts",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"retraction_hop": {
|
||||
"label": "Z Hop Height",
|
||||
"description": "The height difference when performing a Z Hop.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 1,
|
||||
"minimum_value_warning": "-0.0001",
|
||||
"maximum_value_warning": "10",
|
||||
"enabled": "retraction_enable and retraction_hop_enabled",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"material_standby_temperature":
|
||||
{
|
||||
|
|
@ -1511,14 +1512,44 @@
|
|||
},
|
||||
"speed_layer_0": {
|
||||
"label": "Initial Layer Speed",
|
||||
"description": "The print speed for the initial layer. A lower value is advised to improve adhesion to the build plate.",
|
||||
"description": "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate.",
|
||||
"unit": "mm/s",
|
||||
"type": "float",
|
||||
"default_value": 30,
|
||||
"minimum_value": "0.1",
|
||||
"maximum_value": "299792458000",
|
||||
"maximum_value_warning": "300",
|
||||
"settable_per_mesh": true
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
"speed_print_layer_0":
|
||||
{
|
||||
"label": "Initial Layer Print Speed",
|
||||
"description": "The speed of printing for the initial layer. A lower value is advised to improve adhesion to the build plate.",
|
||||
"unit": "mm/s",
|
||||
"type": "float",
|
||||
"default_value": 30,
|
||||
"value": "speed_layer_0",
|
||||
"minimum_value": "0.1",
|
||||
"maximum_value": "299792458000",
|
||||
"maximum_value_warning": "300",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"speed_travel_layer_0":
|
||||
{
|
||||
"label": "Initial Layer Travel Speed",
|
||||
"description": "The speed of travel moves in the initial layer. A lower value is advised to prevent pulling previously printed parts away from the build plate.",
|
||||
"unit": "mm/s",
|
||||
"type": "float",
|
||||
"default_value": 60,
|
||||
"value": "speed_layer_0 * speed_travel / speed_print",
|
||||
"minimum_value": "0.1",
|
||||
"maximum_value": "299792458000",
|
||||
"maximum_value_warning": "300",
|
||||
"settable_per_extruder": true,
|
||||
"settable_per_mesh": false
|
||||
}
|
||||
}
|
||||
},
|
||||
"skirt_brim_speed": {
|
||||
"label": "Skirt/Brim Speed",
|
||||
|
|
@ -1546,8 +1577,8 @@
|
|||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
"acceleration_enabled": {
|
||||
"label": "Enable Acceleration Control",
|
||||
"description": "Enables adjusting the print head acceleration. Increasing the accelerations can reduce printing time at the cost of print quality.",
|
||||
|
|
@ -1718,7 +1749,38 @@
|
|||
"minimum_value_warning": "100",
|
||||
"maximum_value_warning": "10000",
|
||||
"enabled": "acceleration_enabled",
|
||||
"settable_per_mesh": true
|
||||
"settable_per_mesh": true,
|
||||
"children": {
|
||||
"acceleration_print_layer_0":
|
||||
{
|
||||
"label": "Initial Layer Print Acceleration",
|
||||
"description": "The acceleration during the printing of the initial layer.",
|
||||
"unit": "mm/s",
|
||||
"type": "float",
|
||||
"default_value": 3000,
|
||||
"value": "acceleration_layer_0",
|
||||
"minimum_value": "0.1",
|
||||
"minimum_value_warning": "100",
|
||||
"maximum_value_warning": "10000",
|
||||
"enabled": "acceleration_enabled",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"acceleration_travel_layer_0":
|
||||
{
|
||||
"label": "Initial Layer Travel Acceleration",
|
||||
"description": "The acceleration for travel moves in the initial layer.",
|
||||
"unit": "mm/s",
|
||||
"type": "float",
|
||||
"default_value": 3000,
|
||||
"value": "acceleration_layer_0 * acceleration_travel / acceleration_print",
|
||||
"minimum_value": "0.1",
|
||||
"minimum_value_warning": "100",
|
||||
"maximum_value_warning": "10000",
|
||||
"enabled": "acceleration_enabled",
|
||||
"settable_per_extruder": true,
|
||||
"settable_per_mesh": false
|
||||
}
|
||||
}
|
||||
},
|
||||
"acceleration_skirt_brim": {
|
||||
"label": "Skirt/Brim Acceleration",
|
||||
|
|
@ -1734,8 +1796,8 @@
|
|||
"settable_per_mesh": false
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
"jerk_enabled": {
|
||||
"label": "Enable Jerk Control",
|
||||
"description": "Enables adjusting the jerk of print head when the velocity in the X or Y axis changes. Increasing the jerk can reduce printing time at the cost of print quality.",
|
||||
|
|
@ -1906,7 +1968,38 @@
|
|||
"minimum_value_warning": "5",
|
||||
"maximum_value_warning": "50",
|
||||
"enabled": "jerk_enabled",
|
||||
"settable_per_mesh": true
|
||||
"settable_per_mesh": true,
|
||||
"children": {
|
||||
"jerk_print_layer_0":
|
||||
{
|
||||
"label": "Initial Layer Print Jerk",
|
||||
"description": "The maximum instantaneous velocity change during the printing of the initial layer.",
|
||||
"unit": "mm/s",
|
||||
"type": "float",
|
||||
"default_value": 20,
|
||||
"value": "jerk_layer_0",
|
||||
"minimum_value": "0.1",
|
||||
"minimum_value_warning": "5",
|
||||
"maximum_value_warning": "50",
|
||||
"enabled": "jerk_enabled",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"jerk_travel_layer_0":
|
||||
{
|
||||
"label": "Initial Layer Travel Jerk",
|
||||
"description": "The acceleration for travel moves in the initial layer.",
|
||||
"unit": "mm/s",
|
||||
"type": "float",
|
||||
"default_value": 20,
|
||||
"value": "jerk_layer_0 * jerk_travel / jerk_print",
|
||||
"minimum_value": "0.1",
|
||||
"minimum_value_warning": "5",
|
||||
"maximum_value_warning": "50",
|
||||
"enabled": "jerk_enabled",
|
||||
"settable_per_extruder": true,
|
||||
"settable_per_mesh": false
|
||||
}
|
||||
}
|
||||
},
|
||||
"jerk_skirt_brim": {
|
||||
"label": "Skirt/Brim Jerk",
|
||||
|
|
@ -3378,8 +3471,8 @@
|
|||
"type": "float",
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "9999",
|
||||
"default_value": 0,
|
||||
"value": "9999 if draft_shield_height_limitation == 'full' and draft_shield_enabled else 0.0",
|
||||
"default_value": 10,
|
||||
"value": "10",
|
||||
"enabled": "draft_shield_enabled and draft_shield_height_limitation == \"limited\"",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false
|
||||
|
|
|
|||
|
|
@ -54,13 +54,13 @@
|
|||
"speed_travel": { "default_value": 150 },
|
||||
"speed_layer_0": {
|
||||
"minimum_value": "0.1",
|
||||
"default": 15.0
|
||||
"default_value": 15.0
|
||||
},
|
||||
"infill_overlap": { "default": 10 },
|
||||
"cool_fan_enabled": { "default": false },
|
||||
"cool_fan_speed": { "default": 0 },
|
||||
"skirt_line_count": { "default": 3 },
|
||||
"skirt_gap": { "default": 4 },
|
||||
"skirt_brim_minimal_length": { "default": 200 }
|
||||
"infill_overlap": { "default_value": 10 },
|
||||
"cool_fan_enabled": { "default_value": false },
|
||||
"cool_fan_speed": { "default_value": 0 },
|
||||
"skirt_line_count": { "default_value": 3 },
|
||||
"skirt_gap": { "default_value": 4 },
|
||||
"skirt_brim_minimal_length": { "default_value": 200 }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"visible": true,
|
||||
"author": "Calvindog717",
|
||||
"manufacturer": "PrintrBot",
|
||||
"category": "Other",
|
||||
"file_formats": "text/x-gcode"
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
"author": "Ultimaker",
|
||||
"manufacturer": "Ultimaker",
|
||||
"category": "Ultimaker",
|
||||
"weight": 3,
|
||||
"file_formats": "text/x-gcode",
|
||||
"icon": "icon_ultimaker2.png",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
|
|
@ -82,10 +83,10 @@
|
|||
"default_value": 45
|
||||
},
|
||||
"material_print_temperature": {
|
||||
"enabled": "False"
|
||||
"enabled": "not (material_flow_dependent_temperature) and machine_gcode_flavor != \"UltiGCode\""
|
||||
},
|
||||
"material_bed_temperature": {
|
||||
"enabled": "False"
|
||||
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\""
|
||||
},
|
||||
"machine_max_feedrate_x": {
|
||||
"default_value": 300
|
||||
|
|
@ -103,22 +104,22 @@
|
|||
"default_value": 3000
|
||||
},
|
||||
"material_diameter": {
|
||||
"enabled": "False"
|
||||
"enabled": "machine_gcode_flavor != \"UltiGCode\""
|
||||
},
|
||||
"material_flow": {
|
||||
"enabled": "False"
|
||||
"enabled": "machine_gcode_flavor != \"UltiGCode\""
|
||||
},
|
||||
"retraction_amount": {
|
||||
"enabled": "False"
|
||||
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
|
||||
},
|
||||
"retraction_speed": {
|
||||
"enabled": "False"
|
||||
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
|
||||
},
|
||||
"retraction_retract_speed": {
|
||||
"enabled": "False"
|
||||
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
|
||||
},
|
||||
"retraction_prime_speed": {
|
||||
"enabled": "False"
|
||||
"enabled": "retraction_enable and machine_gcode_flavor != \"UltiGCode\""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"author": "Ultimaker",
|
||||
"manufacturer": "Ultimaker",
|
||||
"category": "Ultimaker",
|
||||
"weight": 3,
|
||||
"file_formats": "text/x-gcode",
|
||||
"icon": "icon_ultimaker2.png",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"author": "Ultimaker",
|
||||
"manufacturer": "Ultimaker",
|
||||
"category": "Ultimaker",
|
||||
"weight": 2,
|
||||
"file_formats": "text/x-gcode",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"author": "Ultimaker",
|
||||
"manufacturer": "Ultimaker",
|
||||
"category": "Ultimaker",
|
||||
"weight": 3,
|
||||
"file_formats": "text/x-gcode",
|
||||
"icon": "icon_ultimaker2.png",
|
||||
"platform": "ultimaker2go_platform.obj",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"author": "Ultimaker",
|
||||
"manufacturer": "Ultimaker",
|
||||
"category": "Ultimaker",
|
||||
"weight": 1,
|
||||
"file_formats": "text/x-gcode",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "Ultimaker2Plusbackplate.png",
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
"author": "Ultimaker",
|
||||
"manufacturer": "Ultimaker",
|
||||
"category": "Ultimaker",
|
||||
"weight": 4,
|
||||
"file_formats": "text/x-gcode",
|
||||
"icon": "icon_ultimaker.png",
|
||||
"platform": "ultimaker_platform.stl",
|
||||
|
|
@ -15,7 +16,7 @@
|
|||
"preferred_material": "*pla*",
|
||||
"preferred_quality": "*normal*",
|
||||
"first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
|
||||
"supported_actions": ["UMOCheckup", "UpgradeFirmware", "BedLevel", "UMOUpgradeSelection"]
|
||||
"supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"]
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"author": "Ultimaker",
|
||||
"manufacturer": "Ultimaker",
|
||||
"category": "Ultimaker",
|
||||
"weight": 4,
|
||||
"file_formats": "text/x-gcode",
|
||||
"icon": "icon_ultimaker.png",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue