3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'libArachne_rebased' of github.com:Ultimaker/Cura into PP-25_close-to-100%-density-infill-behaviour-Arachne

Browse source
This commit is contained in:
Jaime van Kessel 2021-11-24 10:43:04 +01:00
commit 571ee5525b
15 changed files with 150 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/definitions/atmat_signal_pro_base.def.json
View file

@ -294,7 +294,7 @@
"support_xy_distance_overhang": { "value": "wall_line_width_0" },
"support_angle": { "value": "60" },
"support_bottom_distance": { "value": "support_z_distance / 2" },
"support_pattern": { "default_value": "'zigzag'" },
"support_pattern": { "default_value": "zigzag" },
"support_top_distance": { "value": "support_z_distance" },
"support_use_towers": { "value": "True" },
"support_z_distance": { "value": "layer_height" },
@ -308,4 +308,4 @@
"support_brim_enable": { "value": "True" },
"prime_tower_enable": { "value": "True" }
}
}
}

6
resources/definitions/cubicon_common.def.json
View file

@ -45,8 +45,8 @@
"wall_thickness": { "value": "1.2" },
"cool_min_layer_time_fan_speed_max": { "default_value": 15 },
"cool_min_layer_time": { "default_value": 15 },
"support_interface_pattern": { "default_value": "'zigzag'" },
"support_pattern": { "default_value": "'zigzag'" },
"support_interface_pattern": { "default_value": "zigzag" },
"support_pattern": { "default_value": "zigzag" },
"retraction_amount": { "default_value": 1.5 }
}
}
}

26
resources/definitions/fdmprinter.def.json
View file

@ -159,6 +159,16 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_height":
{
"label": "Machine Height",
"description": "The height (Z-direction) of the printable area.",
"default_value": 100,
"type": "float",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_shape":
{
"label": "Build Plate Shape",
@ -189,16 +199,6 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_height":
{
"label": "Machine Height",
"description": "The height (Z-direction) of the printable area.",
"default_value": 100,
"type": "float",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_heated_bed":
{
"label": "Has Heated Build Plate",
@ -571,7 +571,7 @@
},
"machine_max_feedrate_e":
{
"label": "Maximum Feedrate",
"label": "Maximum Speed E",
"description": "The maximum speed of the filament.",
"unit": "mm/s",
"type": "float",
@ -1647,7 +1647,7 @@
"concentric": "Concentric",
"zigzag": "Zig Zag"
},
"default_value": "'zigzag'",
"default_value": "zigzag",
"enabled": "ironing_enabled",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
@ -4477,7 +4477,7 @@
"cross": "Cross",
"gyroid": "Gyroid"
},
"default_value": "'zigzag'",
"default_value": "zigzag",
"enabled": "support_enable or support_meshes_present",
"limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": false,

2
resources/definitions/maker_starter.def.json
View file

@ -78,7 +78,7 @@
"default_value": 0.2
},
"support_pattern": {
"default_value": "'zigzag'"
"default_value": "zigzag"
},
"support_infill_rate": {
"value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"

2
resources/definitions/trimaker_cosmosII.def.json
View file

@ -182,7 +182,7 @@
"support_enable": {"default_value": true},
"support_type": {"default_value": "everywhere"},
"support_angle": {"default_value": 50},
"support_pattern": {"default_value": "'zigzag'"},
"support_pattern": {"default_value": "zigzag"},
"support_z_distance": {"default_value": 0.17},
"support_xy_distance": {"default_value": 0.7},
"adhesion_type": {"default_value": "skirt"},

2
resources/definitions/trimaker_nebula.def.json
View file

@ -182,7 +182,7 @@
"support_enable": {"default_value": true},
"support_type": {"default_value": "everywhere"},
"support_angle": {"default_value": 50},
"support_pattern": {"default_value": "'zigzag'"},
"support_pattern": {"default_value": "zigzag"},
"support_z_distance": {"default_value": 0.17},
"support_xy_distance": {"default_value": 0.7},
"adhesion_type": {"default_value": "skirt"},

5
resources/definitions/ultimaker.def.json
View file

@ -41,6 +41,9 @@
"value": false,
"enabled": false
},
"skin_angles": {
"value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]"
},
"line_width": {
"value": "machine_nozzle_size"
},
@ -54,7 +57,7 @@
"value": true
},
"speed_equalize_flow_width_factor": {
"value": "1.1"
"value": "110.0"
},
"meshfix_maximum_extrusion_area_deviation": {
"value": "50000"