3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'main' into PP-430-Enable-monotonic-raft-surface

Browse source
This commit is contained in:
Casper Lamboo 2024-02-27 12:42:40 +01:00 • committed by GitHub
commit e64b6ecd22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
783 changed files with 3961 additions and 1062 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,7 @@
"min_infill_area": { "value": "5.0" },
"minimum_polygon_circumference": { "value": "0.2" },
"optimize_wall_printing_order": { "value": "True" },
"prime_tower_enable": { "value": "True" },
"prime_tower_mode": { "value": "'normal'" },
"retraction_amount": { "value": "1" },
"retraction_combing": { "value": "'noskin'" },
"retraction_combing_max_distance": { "value": "10" },

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

@ -45,7 +45,7 @@
"machine_max_feedrate_y": { "value": 500 },
"machine_max_feedrate_z": { "value": 30 },
"machine_name": { "default_value": "Creality Ender-3 V3 SE" },
"machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nM420 S1; Enable mesh leveling\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S[material_print_temperature_layer_0]\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 E-1.0000 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0.0000 F1800 \n" },
"machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nM420 S1; Use saved mesh leveling data\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nM109 S{material_print_temperature_layer_0} ; Set hotend temperature and wait\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 E-1.0000 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0.0000 F1800 \n" },
"machine_width": { "default_value": 220 },
"retraction_amount": { "value": 0.8 },
"retraction_speed": { "default_value": 40 },

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

@ -31,8 +31,8 @@
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"material_standby_temperature": { "value": "material_print_temperature" },
"prime_tower_enable": { "value": true },
"prime_tower_min_volume": { "value": "50" },
"prime_tower_mode": { "value": "'normal'" },
"switch_extruder_retraction_amount": { "value": "0" }
}
}

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

@ -31,8 +31,8 @@
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"material_standby_temperature": { "value": "material_print_temperature" },
"prime_tower_enable": { "value": true },
"prime_tower_min_volume": { "value": "50" },
"prime_tower_mode": { "value": "'normal'" },
"switch_extruder_retraction_amount": { "value": "0" }
}
}

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

@ -31,8 +31,8 @@
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"material_standby_temperature": { "value": "material_print_temperature" },
"prime_tower_enable": { "value": "1" },
"prime_tower_min_volume": { "value": "50" },
"prime_tower_mode": { "value": "'normal'" },
"switch_extruder_retraction_amount": { "value": "0" }
}
}

3
resources/definitions/dxu_dual.def.json
View file

@ -5,7 +5,6 @@
"overrides":
{
"machine_end_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" },
"machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\"" },
"prime_tower_enable": { "default_value": true }
"machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\"" }
}
}

1
resources/definitions/elegoo_neptune_2D.def.json
View file

@ -55,7 +55,6 @@
"settable_per_extruder": false
},
"prime_blob_enable": { "default_value": false },
"prime_tower_enable": { "default_value": true },
"prime_tower_min_volume": { "default_value": 90 },
"prime_tower_size": { "default_value": 30 },
"raft_airgap": { "default_value": 0.25 },

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

@ -76,6 +76,22 @@
"type": "str",
"enabled": false
},
"material_type":
{
"label": "Material Type",
"description": "The type of material used.",
"default_value": "",
"type": "str",
"enabled": false
},
"material_brand":
{
"label": "Material Brand",
"description": "The brand of material used.",
"default_value": "",
"type": "str",
"enabled": false
},
"material_diameter":
{
"label": "Diameter",
@ -963,7 +979,7 @@
"description": "Width of a single prime tower line.",
"type": "float",
"unit": "mm",
"enabled": "resolveOrValue('prime_tower_enable')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 0.4,
"value": "line_width",
"minimum_value": "0.001",
@ -3347,7 +3363,7 @@
"description": "The speed at which the prime tower is printed. Printing the prime tower slower can make it more stable when the adhesion between the different filaments is suboptimal.",
"type": "float",
"unit": "mm/s",
"enabled": "resolveOrValue('prime_tower_enable')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 60,
"value": "speed_print",
"minimum_value": "0.1",
@ -3725,7 +3741,7 @@
"maximum_value_warning": "10000",
"default_value": 3000,
"value": "acceleration_print",
"enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('acceleration_enabled')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('acceleration_enabled')",
"settable_per_mesh": false
}
}
@ -4044,7 +4060,7 @@
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_print",
"enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('jerk_enabled')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('jerk_enabled')",
"settable_per_mesh": false
}
}
@ -5135,7 +5151,7 @@
"unit": "mm",
"type": "float",
"minimum_value": "0",
"maximum_value_warning": "machine_nozzle_size",
"maximum_value_warning": "5*layer_height",
"default_value": 0.1,
"limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
"enabled": "support_enable or support_meshes_present",
@ -6778,14 +6794,20 @@
"description": "Settings used for printing with multiple extruders.",
"children":
{
"prime_tower_enable":
"prime_tower_mode":
{
"label": "Enable Prime Tower",
"description": "Print a tower next to the print which serves to prime the material after each nozzle switch.",
"type": "bool",
"label": "Prime Tower",
"description": "<html>Print a tower next to the model, which serves to prime the material after each nozzle switch.<ul><li><b>None:</b> do not generate a prime tower</li><li><b>Normal:</b> generate a bucket in which secondary materials are primed</li><li><b>Interleaved:</b> generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.</li></ul></html>",
"type": "enum",
"value": "'none' if (extruders_enabled_count < 2) else ('interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal')",
"options":
{
"none": "None",
"normal": "Normal",
"interleaved": "Interleaved"
},
"default_value": "none",
"enabled": "extruders_enabled_count > 1",
"default_value": false,
"resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable'))",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@ -6795,7 +6817,7 @@
"description": "The width of the prime tower.",
"type": "float",
"unit": "mm",
"enabled": "resolveOrValue('prime_tower_enable')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 20,
"resolve": "max(extruderValues('prime_tower_size'))",
"minimum_value": "0",
@ -6814,7 +6836,20 @@
"default_value": 6,
"minimum_value": "0",
"maximum_value_warning": "(resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height') - sum(extruderValues('prime_tower_min_volume')) + prime_tower_min_volume",
"enabled": "resolveOrValue('prime_tower_enable')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"prime_tower_max_bridging_distance":
{
"label": "Prime Tower Maximum Bridging Distance",
"description": "The maximum length of the branches which may be printed over the air.",
"unit": "mm",
"type": "float",
"default_value": 5,
"minimum_value": "line_width",
"maximum_value_warning": "10.0",
"enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -6824,7 +6859,7 @@
"description": "The x coordinate of the position of the prime tower.",
"type": "float",
"unit": "mm",
"enabled": "resolveOrValue('prime_tower_enable')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 200,
"value": "(resolveOrValue('machine_width') / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (resolveOrValue('machine_width') - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('machine_nozzle_offset_x')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (resolveOrValue('machine_width') / 2 if resolveOrValue('machine_center_is_zero') else 0)",
"maximum_value": "(machine_width / 2 if machine_center_is_zero else machine_width) - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0)",
@ -6838,7 +6873,7 @@
"description": "The y coordinate of the position of the prime tower.",
"type": "float",
"unit": "mm",
"enabled": "resolveOrValue('prime_tower_enable')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 200,
"value": "machine_depth - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('machine_nozzle_offset_y')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (resolveOrValue('machine_depth') / 2 if resolveOrValue('machine_center_is_zero') else 0)",
"maximum_value": "(machine_depth / 2 - resolveOrValue('prime_tower_size') if machine_center_is_zero else machine_depth - resolveOrValue('prime_tower_size')) - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0)",
@ -6851,7 +6886,7 @@
"label": "Wipe Inactive Nozzle on Prime Tower",
"description": "After printing the prime tower with one nozzle, wipe the oozed material from the other nozzle off on the prime tower.",
"type": "bool",
"enabled": "resolveOrValue('prime_tower_enable')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": true,
"settable_per_mesh": false,
"settable_per_extruder": true
@ -6862,7 +6897,7 @@
"label": "Prime Tower Base",
"description": "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height.",
"type": "bool",
"enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('adhesion_type') != 'raft'",
"enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('adhesion_type') != 'raft'",
"default_value": false,
"settable_per_mesh": false,
"settable_per_extruder": false
@ -6874,7 +6909,7 @@
"description": "The width of the prime tower brim/base. A larger base enhances adhesion to the build plate, but also reduces the effective print area.",
"type": "float",
"unit": "mm",
"enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none' and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
"default_value": 1.2,
"minimum_value": "0",
"maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
@ -6888,7 +6923,7 @@
"description": "The height of the prime tower base. Increasing this value will result in a more sturdy prime tower because the base will be wider. If this setting is too low, the prime tower will not have a sturdy base.",
"type": "float",
"unit": "mm",
"enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none' and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
"default_value": 0,
"minimum_value": "0",
"maximum_value": "machine_height",
@ -6900,7 +6935,7 @@
"label": "Prime Tower Base Slope",
"description": "The magnitude factor used for the slope of the prime tower base. If you increase this value, the base will become slimmer. If you decrease it, the base will become thicker.",
"type": "float",
"enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
"enabled": "resolveOrValue('prime_tower_mode') != 'none' and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
"default_value": 4,
"minimum_value": "0",
"maximum_value": "10",
@ -6918,7 +6953,7 @@
"minimum_value": "0",
"minimum_value_warning": "raft_base_line_width",
"maximum_value_warning": "100",
"enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('adhesion_type') == 'raft'",
"enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('adhesion_type') == 'raft'",
"settable_per_mesh": false,
"settable_per_extruder": true,
"limit_to_extruder": "raft_base_extruder_nr"
@ -7246,6 +7281,16 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"user_defined_print_order_enabled":
{
"label": "Set Print Sequence Manually",
"description": "Allows to order the object list to set the print sequence manually. First object from the list will be printed first.",
"type": "bool",
"default_value": false,
"settable_per_mesh": false,
"settable_per_extruder": false,
"enabled": "print_sequence == 'one_at_a_time'"
},
"infill_mesh":
{
"label": "Infill Mesh",

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

@ -80,7 +80,7 @@
"material_final_print_temperature": { "value": "default_material_print_temperature" },
"material_initial_print_temperature": { "value": "default_material_print_temperature" },
"material_standby_temperature": { "enabled": false },
"prime_tower_enable": { "resolve": "extruders_enabled_count > 1" },
"prime_tower_mode": { "resolve": "'normal' if extruders_enabled_count > 1 else 'none'" },
"retraction_amount": { "default_value": 2 },
"retraction_combing": { "value": "'all'" },
"skirt_line_count": { "default_value": 3 },

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

@ -44,8 +44,8 @@
"machine_width": { "default_value": 235 },
"meshfix_maximum_resolution": { "value": 0.25 },
"optimize_wall_printing_order": { "value": true },
"prime_tower_enable": { "value": true },
"prime_tower_min_volume": { "value": 30 },
"prime_tower_mode": { "value": "'normal'" },
"retract_at_layer_change": { "value": false },
"retraction_amount": { "value": 4.5 },
"roofing_layer_count": { "value": 1 },

1
resources/definitions/strateo3d_IDEX420.def.json
View file

@ -112,7 +112,6 @@
"machine_use_extruder_offset_to_offset_coords": { "default_value": false },
"machine_width": { "default_value": 420 },
"material_diameter": { "default_value": 1.75 },
"prime_tower_enable": { "default_value": true },
"prime_tower_min_volume": { "default_value": 35.6 },
"raft_acceleration": { "value": "machine_acceleration" },
"raft_base_acceleration": { "value": "machine_acceleration" },

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

@ -103,6 +103,7 @@
"retraction_combing_max_distance": { "value": 15 },
"retraction_count_max": { "value": 25 },
"retraction_extrusion_window": { "value": 1 },
"retraction_min_travel": { "value": 5 },
"roofing_layer_count": { "value": "1" },
"roofing_material_flow": { "value": "material_flow" },
"skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" },

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

@ -149,14 +149,12 @@
"enabled": true,
"value": "resolveOrValue('print_sequence') != 'one_at_a_time'"
},
"prime_tower_enable": { "default_value": true },
"prime_tower_position_x": { "value": "185" },
"prime_tower_wipe_enabled": { "default_value": false },
"retraction_amount": { "value": "6.5" },
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
"retraction_hop_only_when_collides": { "value": "True" },
"retraction_min_travel": { "value": "5" },
"retraction_prime_speed": { "value": "15" },
"skin_overlap": { "value": "10" },
"speed_prime_tower": { "value": "speed_topbottom" },

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

@ -28,7 +28,6 @@
"generic_hips_175",
"generic_pc_175",
"ultimaker_rapidrinse_175",
"ultimaker_sr30_175",
"generic_tpu_175",
"goofoo_",
"ideagen3D_",
@ -346,9 +345,9 @@
"prime_tower_base_curve_magnitude": { "value": 2 },
"prime_tower_base_height": { "value": 6 },
"prime_tower_base_size": { "value": 10 },
"prime_tower_enable": { "value": false },
"prime_tower_flow": { "value": "material_flow" },
"prime_tower_line_width": { "value": 1 },
"prime_tower_mode": { "value": "none" },
"prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" },
"prime_tower_wipe_enabled": { "value": true },
"print_sequence": { "enabled": false },
@ -373,7 +372,6 @@
"retraction_hop": { "value": 0.4 },
"retraction_hop_enabled": { "value": true },
"retraction_hop_only_when_collides": { "value": false },
"retraction_min_travel": { "value": "line_width * 4" },
"retraction_prime_speed": { "value": "retraction_speed" },
"retraction_speed": { "value": 5 },
"roofing_layer_count": { "value": 2 },

1
resources/definitions/ultimaker_methodx.def.json
View file

@ -35,7 +35,6 @@
"generic_nylon_175",
"generic_hips_175",
"generic_pc_175",
"ultimaker_sr30_175",
"generic_tpu_175",
"goofoo_",
"ideagen3D_",

3
resources/definitions/ultimaker_s3.def.json
View file

@ -103,12 +103,11 @@
"default_value": false,
"enabled": true
},
"prime_tower_enable": { "value": "True" },
"prime_tower_mode": { "value": "'normal'" },
"retraction_amount": { "value": "6.5" },
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
"retraction_hop_only_when_collides": { "value": "True" },
"retraction_min_travel": { "value": "5" },
"retraction_prime_speed": { "value": "15" },
"retraction_speed": { "value": "45" },
"speed_prime_tower": { "value": "speed_topbottom" },

3
resources/definitions/ultimaker_s5.def.json
View file

@ -104,13 +104,12 @@
"default_value": false,
"enabled": true
},
"prime_tower_enable": { "value": "True" },
"prime_tower_mode": { "value": "'normal'" },
"retraction_amount": { "value": "6.5" },
"retraction_combing": { "value": "'no_outer_surfaces'" },
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
"retraction_hop_only_when_collides": { "value": "True" },
"retraction_min_travel": { "value": "5" },
"retraction_prime_speed": { "value": "15" },
"retraction_speed": { "value": "45" },
"speed_prime_tower": { "value": "speed_topbottom" },