mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-08 22:35:03 -06:00
CURA-4400 fixed merge conflicts
This commit is contained in:
Jack Ha
commit
bad637eb14
121 changed files with 1157 additions and 936 deletions
|
|
@ -6,8 +6,7 @@
|
|||
"visible": true,
|
||||
"author": "ABAX 3d Technologies",
|
||||
"manufacturer": "ABAX 3d Technologies",
|
||||
"file_formats": "text/x-gcode",
|
||||
"has_machine_quality": true
|
||||
"file_formats": "text/x-gcode"
|
||||
},
|
||||
"overrides": {
|
||||
"machine_start_gcode": {
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
"default_value": 60
|
||||
},
|
||||
"speed_travel": {
|
||||
"default_value": 100
|
||||
"value": "100"
|
||||
},
|
||||
"retraction_amount": {
|
||||
"default_value": 3.5
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
"default_value": "elliptic"
|
||||
},
|
||||
"machine_gcode_flavor": {
|
||||
"default_value": "RepRap"
|
||||
"default_value": "RepRap (RepRap)"
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"default_value": ";Gcode by Cura\nG90\nG28\nM109 S100\nG29\nM104 S{material_print_temperature_layer_0}\nG0 X0 Y-85\nG0 Z0.26\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@
|
|||
"overrides": {
|
||||
"machine_name": { "default_value": "FABtotum Personal Fabricator" },
|
||||
"machine_start_gcode": {
|
||||
"default_value": ";Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {infill_sparse_density}\n;Top\\Bottom Thickness: {top_bottom_thickness}\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG4 S1 ;1 millisecond pause to buffer the bep bep \nM728 ;FAB bep bep (start the print, go check the oozing and skirt lines adesion) \nG4 S1 ;1 second pause to reach the printer (run fast)\nG92 E0 ;zero the extruded length \nG1 F200 E35 ;slowly extrude 35mm of filament to clean the nozzle and build up extrusion pressure \nG92 E0 ;zero the extruded length again \nG1 F{speed_travel} ;Set travel speed \n;print"
|
||||
"default_value": ";Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {infill_sparse_density}\n;Top\\Bottom Thickness: {top_bottom_thickness}\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG4 S1 ;1 millisecond pause to buffer the bep bep \nM300 S2 ;FAB bep bep (start the print, go check the oozing and skirt lines adesion) \nG4 S1 ;1 second pause to reach the printer (run fast)\nG92 E0 ;zero the extruded length \nG1 F200 E35 ;slowly extrude 35mm of filament to clean the nozzle and build up extrusion pressure \nG92 E0 ;zero the extruded length again \n;print"
|
||||
},
|
||||
"machine_end_gcode": {
|
||||
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM728 ;FAB bep bep (end print)"
|
||||
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM300 S2 ;FAB bep bep (end print)"
|
||||
},
|
||||
"gantry_height": { "default_value": 55 },
|
||||
"machine_width": { "default_value": 214 },
|
||||
|
|
|
|||
|
|
@ -20,12 +20,10 @@
|
|||
"overrides": {
|
||||
"machine_name": { "default_value": "Ultimaker 2" },
|
||||
"machine_start_gcode" : {
|
||||
"default_value": "",
|
||||
"value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\""
|
||||
},
|
||||
"machine_end_gcode" : {
|
||||
"default_value": "",
|
||||
"value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"M104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\""
|
||||
"value": "\";Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\" if machine_gcode_flavor == \"UltiGCode\" else \"M104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\n;Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\""
|
||||
},
|
||||
"machine_width": {
|
||||
"default_value": 223
|
||||
|
|
|
|||
|
|
@ -123,7 +123,6 @@
|
|||
"raft_margin": { "value": "10" },
|
||||
"raft_surface_layers": { "value": "1" },
|
||||
"retraction_amount": { "value": "2" },
|
||||
"retraction_combing": { "default_value": "noskin" },
|
||||
"retraction_count_max": { "value": "10" },
|
||||
"retraction_extrusion_window": { "value": "1" },
|
||||
"retraction_hop": { "value": "2" },
|
||||
|
|
@ -154,6 +153,7 @@
|
|||
"travel_avoid_distance": { "value": "3" },
|
||||
"wall_0_inset": { "value": "0" },
|
||||
"wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" },
|
||||
"wall_thickness": { "value": "1" }
|
||||
"wall_thickness": { "value": "1" },
|
||||
"zig_zaggify_infill": { "value": "True" }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,120 +8,71 @@ weight = 2
|
|||
layer_height
|
||||
layer_height_0
|
||||
line_width
|
||||
wall_line_width
|
||||
wall_line_width_0
|
||||
wall_line_width_x
|
||||
skin_line_width
|
||||
infill_line_width
|
||||
initial_layer_line_width_factor
|
||||
|
||||
[shell]
|
||||
wall_extruder_nr
|
||||
wall_0_extruder_nr
|
||||
wall_x_extruder_nr
|
||||
wall_thickness
|
||||
wall_0_wipe_dist
|
||||
roofing_extruder_nr
|
||||
roofing_layer_count
|
||||
wall_line_count
|
||||
top_bottom_extruder_nr
|
||||
top_bottom_thickness
|
||||
top_bottom_pattern
|
||||
top_bottom_pattern_0
|
||||
skin_angles
|
||||
wall_0_inset
|
||||
top_thickness
|
||||
top_layers
|
||||
bottom_thickness
|
||||
bottom_layers
|
||||
optimize_wall_printing_order
|
||||
outer_inset_first
|
||||
alternate_extra_perimeter
|
||||
travel_compensate_overlapping_walls_enabled
|
||||
fill_perimeter_gaps
|
||||
filter_out_tiny_gaps
|
||||
fill_outline_gaps
|
||||
xy_offset
|
||||
xy_offset_layer_0
|
||||
z_seam_type
|
||||
z_seam_x
|
||||
z_seam_y
|
||||
z_seam_corner
|
||||
z_seam_relative
|
||||
skin_no_small_gaps_heuristic
|
||||
skin_outline_count
|
||||
ironing_enabled
|
||||
ironing_only_highest_layer
|
||||
ironing_pattern
|
||||
ironing_line_spacing
|
||||
ironing_flow
|
||||
ironing_inset
|
||||
speed_ironing
|
||||
acceleration_ironing
|
||||
jerk_ironing
|
||||
|
||||
[infill]
|
||||
infill_extruder_nr
|
||||
infill_sparse_density
|
||||
infill_line_distance
|
||||
infill_pattern
|
||||
zig_zaggify_infill
|
||||
infill_angles
|
||||
infill_offset_x
|
||||
infill_offset_y
|
||||
sub_div_rad_add
|
||||
infill_overlap
|
||||
skin_overlap
|
||||
infill_wipe_dist
|
||||
infill_sparse_thickness
|
||||
gradual_infill_steps
|
||||
gradual_infill_step_height
|
||||
infill_before_walls
|
||||
min_infill_area
|
||||
skin_preshrink
|
||||
expand_skins_expand_distance
|
||||
max_skin_angle_for_expansion
|
||||
|
||||
[material]
|
||||
default_material_print_temperature
|
||||
material_print_temperature
|
||||
material_print_temperature_layer_0
|
||||
material_initial_print_temperature
|
||||
material_final_print_temperature
|
||||
material_extrusion_cool_down_speed
|
||||
default_material_bed_temperature
|
||||
material_bed_temperature
|
||||
material_bed_temperature_layer_0
|
||||
material_diameter
|
||||
material_adhesion_tendency
|
||||
material_surface_energy
|
||||
material_flow
|
||||
retraction_enable
|
||||
retract_at_layer_change
|
||||
retraction_amount
|
||||
retraction_speed
|
||||
retraction_extra_prime_amount
|
||||
retraction_min_travel
|
||||
retraction_count_max
|
||||
retraction_extrusion_window
|
||||
material_standby_temperature
|
||||
switch_extruder_retraction_amount
|
||||
switch_extruder_retraction_speeds
|
||||
|
||||
[speed]
|
||||
speed_print
|
||||
speed_infill
|
||||
speed_wall
|
||||
speed_wall_0
|
||||
speed_wall_x
|
||||
speed_topbottom
|
||||
speed_support
|
||||
speed_prime_tower
|
||||
speed_travel
|
||||
speed_layer_0
|
||||
skirt_brim_speed
|
||||
max_feedrate_z_override
|
||||
speed_slowdown_layers
|
||||
speed_equalize_flow_enabled
|
||||
speed_equalize_flow_max
|
||||
acceleration_enabled
|
||||
acceleration_print
|
||||
acceleration_travel
|
||||
acceleration_layer_0
|
||||
acceleration_skirt_brim
|
||||
jerk_enabled
|
||||
jerk_print
|
||||
jerk_travel
|
||||
jerk_layer_0
|
||||
jerk_skirt_brim
|
||||
|
||||
[travel]
|
||||
retraction_combing
|
||||
travel_retract_before_outer_wall
|
||||
travel_avoid_other_parts
|
||||
travel_avoid_distance
|
||||
start_layers_at_same_position
|
||||
layer_start_x
|
||||
layer_start_y
|
||||
retraction_hop_enabled
|
||||
retraction_hop_only_when_collides
|
||||
retraction_hop
|
||||
|
|
@ -130,9 +81,12 @@ retraction_hop_after_extruder_switch
|
|||
[cooling]
|
||||
cool_fan_enabled
|
||||
cool_fan_speed
|
||||
cool_fan_speed_min
|
||||
cool_fan_speed_max
|
||||
cool_min_layer_time_fan_speed_max
|
||||
cool_fan_speed_0
|
||||
cool_fan_full_at_height
|
||||
cool_fan_full_layer
|
||||
cool_min_layer_time
|
||||
cool_min_speed
|
||||
cool_lift_head
|
||||
|
|
@ -140,115 +94,45 @@ cool_lift_head
|
|||
[support]
|
||||
support_enable
|
||||
support_extruder_nr
|
||||
support_infill_extruder_nr
|
||||
support_extruder_nr_layer_0
|
||||
support_interface_extruder_nr
|
||||
support_type
|
||||
support_angle
|
||||
support_pattern
|
||||
support_connect_zigzags
|
||||
support_infill_rate
|
||||
support_z_distance
|
||||
support_xy_distance
|
||||
support_xy_overrides_z
|
||||
support_xy_distance_overhang
|
||||
support_bottom_stair_step_height
|
||||
support_bottom_stair_step_width
|
||||
support_join_distance
|
||||
support_offset
|
||||
support_infill_sparse_thickness
|
||||
gradual_support_infill_steps
|
||||
gradual_support_infill_step_height
|
||||
support_interface_enable
|
||||
support_interface_height
|
||||
support_interface_skip_height
|
||||
support_interface_density
|
||||
support_interface_pattern
|
||||
support_use_towers
|
||||
support_tower_diameter
|
||||
support_minimal_diameter
|
||||
support_tower_roof_angle
|
||||
support_mesh_drop_down
|
||||
support_roof_enable
|
||||
support_bottom_enable
|
||||
|
||||
[platform_adhesion]
|
||||
prime_blob_enable
|
||||
extruder_prime_pos_x
|
||||
extruder_prime_pos_y
|
||||
adhesion_type
|
||||
adhesion_extruder_nr
|
||||
skirt_line_count
|
||||
skirt_gap
|
||||
skirt_brim_minimal_length
|
||||
brim_width
|
||||
brim_line_count
|
||||
brim_outside_only
|
||||
raft_margin
|
||||
raft_smoothing
|
||||
raft_airgap
|
||||
layer_0_z_overlap
|
||||
raft_surface_layers
|
||||
raft_surface_thickness
|
||||
raft_surface_line_width
|
||||
raft_surface_line_spacing
|
||||
raft_interface_thickness
|
||||
raft_interface_line_width
|
||||
raft_interface_line_spacing
|
||||
raft_base_thickness
|
||||
raft_base_line_width
|
||||
raft_base_line_spacing
|
||||
raft_speed
|
||||
raft_acceleration
|
||||
raft_jerk
|
||||
raft_fan_speed
|
||||
|
||||
[dual]
|
||||
prime_tower_enable
|
||||
prime_tower_size
|
||||
prime_tower_min_volume
|
||||
prime_tower_position_x
|
||||
prime_tower_position_y
|
||||
prime_tower_flow
|
||||
prime_tower_wipe_enabled
|
||||
dual_pre_wipe
|
||||
prime_tower_purge_volume
|
||||
ooze_shield_enabled
|
||||
ooze_shield_angle
|
||||
ooze_shield_dist
|
||||
|
||||
[meshfix]
|
||||
meshfix_union_all
|
||||
meshfix_union_all_remove_holes
|
||||
meshfix_extensive_stitching
|
||||
meshfix_keep_open_polygons
|
||||
multiple_mesh_overlap
|
||||
carve_multiple_volumes
|
||||
alternate_carve_order
|
||||
remove_empty_first_layers
|
||||
|
||||
[blackmagic]
|
||||
print_sequence
|
||||
infill_mesh
|
||||
infill_mesh_order
|
||||
cutting_mesh
|
||||
mold_enabled
|
||||
mold_width
|
||||
mold_roof_height
|
||||
mold_angle
|
||||
support_mesh
|
||||
anti_overhang_mesh
|
||||
magic_mesh_surface_mode
|
||||
magic_spiralize
|
||||
smooth_spiralized_contours
|
||||
relative_extrusion
|
||||
|
||||
[experimental]
|
||||
infill_enable_travel_optimization
|
||||
material_flow_dependent_temperature
|
||||
material_flow_temp_graph
|
||||
meshfix_maximum_resolution
|
||||
roofing_angles
|
||||
roofing_pattern
|
||||
slicing_tolerance
|
||||
support_tree_angle
|
||||
support_tree_branch_diameter
|
||||
support_tree_branch_diameter_angle
|
||||
support_tree_branch_distance
|
||||
support_tree_collision_resolution
|
||||
support_tree_enable
|
||||
support_tree_wall_thickness
|
||||
conical_overhang_enabled
|
||||
support_conical_enabled
|
||||
adaptive_layer_height_enabled
|
||||
|
|
|
|||
|
|
@ -9,30 +9,28 @@ layer_height
|
|||
|
||||
[shell]
|
||||
wall_thickness
|
||||
wall_line_count
|
||||
top_bottom_thickness
|
||||
z_seam_x
|
||||
z_seam_y
|
||||
top_thickness
|
||||
top_layers
|
||||
bottom_thickness
|
||||
bottom_layers
|
||||
xy_offset
|
||||
|
||||
[infill]
|
||||
infill_sparse_density
|
||||
gradual_infill_steps
|
||||
infill_pattern
|
||||
|
||||
[material]
|
||||
material_print_temperature
|
||||
material_bed_temperature
|
||||
material_diameter
|
||||
material_flow
|
||||
retraction_enable
|
||||
|
||||
[speed]
|
||||
speed_print
|
||||
speed_travel
|
||||
acceleration_print
|
||||
acceleration_travel
|
||||
jerk_print
|
||||
jerk_travel
|
||||
|
||||
[travel]
|
||||
retraction_hop_enabled
|
||||
|
||||
[cooling]
|
||||
cool_fan_enabled
|
||||
|
|
@ -41,26 +39,20 @@ cool_fan_enabled
|
|||
support_enable
|
||||
support_extruder_nr
|
||||
support_type
|
||||
support_angle
|
||||
|
||||
[platform_adhesion]
|
||||
prime_blob_enable
|
||||
adhesion_type
|
||||
adhesion_extruder_nr
|
||||
brim_width
|
||||
raft_airgap
|
||||
layer_0_z_overlap
|
||||
raft_surface_layers
|
||||
|
||||
[dual]
|
||||
prime_tower_enable
|
||||
prime_tower_size
|
||||
prime_tower_position_x
|
||||
prime_tower_position_y
|
||||
|
||||
[meshfix]
|
||||
|
||||
[blackmagic]
|
||||
print_sequence
|
||||
infill_mesh
|
||||
cutting_mesh
|
||||
|
||||
[experimental]
|
||||
[experimental]
|
||||
|
|
|
|||
|
|
@ -8,15 +8,33 @@ weight = 3
|
|||
layer_height
|
||||
layer_height_0
|
||||
line_width
|
||||
wall_line_width
|
||||
wall_line_width_0
|
||||
wall_line_width_x
|
||||
skin_line_width
|
||||
infill_line_width
|
||||
skirt_brim_line_width
|
||||
support_line_width
|
||||
support_interface_line_width
|
||||
support_roof_line_width
|
||||
support_bottom_line_width
|
||||
prime_tower_line_width
|
||||
initial_layer_line_width_factor
|
||||
|
||||
[shell]
|
||||
wall_extruder_nr
|
||||
wall_0_extruder_nr
|
||||
wall_x_extruder_nr
|
||||
wall_thickness
|
||||
wall_line_count
|
||||
wall_0_wipe_dist
|
||||
roofing_extruder_nr
|
||||
roofing_layer_count
|
||||
top_bottom_extruder_nr
|
||||
top_bottom_thickness
|
||||
top_thickness
|
||||
top_layers
|
||||
bottom_thickness
|
||||
bottom_layers
|
||||
top_bottom_pattern
|
||||
top_bottom_pattern_0
|
||||
skin_angles
|
||||
|
|
@ -25,6 +43,8 @@ optimize_wall_printing_order
|
|||
outer_inset_first
|
||||
alternate_extra_perimeter
|
||||
travel_compensate_overlapping_walls_enabled
|
||||
travel_compensate_overlapping_walls_0_enabled
|
||||
travel_compensate_overlapping_walls_x_enabled
|
||||
fill_perimeter_gaps
|
||||
filter_out_tiny_gaps
|
||||
fill_outline_gaps
|
||||
|
|
@ -50,6 +70,7 @@ jerk_ironing
|
|||
[infill]
|
||||
infill_extruder_nr
|
||||
infill_sparse_density
|
||||
infill_line_distance
|
||||
infill_pattern
|
||||
zig_zaggify_infill
|
||||
infill_angles
|
||||
|
|
@ -57,7 +78,9 @@ infill_offset_x
|
|||
infill_offset_y
|
||||
sub_div_rad_add
|
||||
infill_overlap
|
||||
infill_overlap_mm
|
||||
skin_overlap
|
||||
skin_overlap_mm
|
||||
infill_wipe_dist
|
||||
infill_sparse_thickness
|
||||
gradual_infill_steps
|
||||
|
|
@ -65,8 +88,13 @@ gradual_infill_step_height
|
|||
infill_before_walls
|
||||
min_infill_area
|
||||
skin_preshrink
|
||||
top_skin_preshrink
|
||||
bottom_skin_preshrink
|
||||
expand_skins_expand_distance
|
||||
top_skin_expand_distance
|
||||
bottom_skin_expand_distance
|
||||
max_skin_angle_for_expansion
|
||||
min_skin_width_for_expansion
|
||||
|
||||
[material]
|
||||
default_material_print_temperature
|
||||
|
|
@ -75,17 +103,19 @@ material_print_temperature_layer_0
|
|||
material_initial_print_temperature
|
||||
material_final_print_temperature
|
||||
material_extrusion_cool_down_speed
|
||||
default_material_bed_temperature
|
||||
material_bed_temperature
|
||||
material_bed_temperature_layer_0
|
||||
material_diameter
|
||||
material_adhesion_tendency
|
||||
material_surface_energy
|
||||
material_flow
|
||||
material_flow_layer_0
|
||||
retraction_enable
|
||||
retract_at_layer_change
|
||||
retraction_amount
|
||||
retraction_speed
|
||||
retraction_retract_speed
|
||||
retraction_prime_speed
|
||||
retraction_extra_prime_amount
|
||||
retraction_min_travel
|
||||
retraction_count_max
|
||||
|
|
@ -93,11 +123,25 @@ retraction_extrusion_window
|
|||
material_standby_temperature
|
||||
switch_extruder_retraction_amount
|
||||
switch_extruder_retraction_speeds
|
||||
switch_extruder_retraction_speed
|
||||
switch_extruder_prime_speed
|
||||
|
||||
[speed]
|
||||
speed_print
|
||||
speed_infill
|
||||
speed_wall
|
||||
speed_wall_0
|
||||
speed_wall_x
|
||||
speed_roofing
|
||||
speed_topbottom
|
||||
speed_support
|
||||
speed_support_infill
|
||||
speed_support_interface
|
||||
speed_prime_tower
|
||||
speed_travel
|
||||
speed_layer_0
|
||||
speed_print_layer_0
|
||||
speed_travel_layer_0
|
||||
skirt_brim_speed
|
||||
max_feedrate_z_override
|
||||
speed_slowdown_layers
|
||||
|
|
@ -105,13 +149,37 @@ speed_equalize_flow_enabled
|
|||
speed_equalize_flow_max
|
||||
acceleration_enabled
|
||||
acceleration_print
|
||||
acceleration_infill
|
||||
acceleration_wall
|
||||
acceleration_wall_0
|
||||
acceleration_wall_x
|
||||
acceleration_roofing
|
||||
acceleration_topbottom
|
||||
acceleration_support
|
||||
acceleration_support_infill
|
||||
acceleration_support_interface
|
||||
acceleration_prime_tower
|
||||
acceleration_travel
|
||||
acceleration_layer_0
|
||||
acceleration_print_layer_0
|
||||
acceleration_travel_layer_0
|
||||
acceleration_skirt_brim
|
||||
jerk_enabled
|
||||
jerk_print
|
||||
jerk_infill
|
||||
jerk_wall
|
||||
jerk_wall_0
|
||||
jerk_wall_x
|
||||
jerk_roofing
|
||||
jerk_topbottom
|
||||
jerk_support
|
||||
jerk_support_infill
|
||||
jerk_support_interface
|
||||
jerk_prime_tower
|
||||
jerk_travel
|
||||
jerk_layer_0
|
||||
jerk_print_layer_0
|
||||
jerk_travel_layer_0
|
||||
jerk_skirt_brim
|
||||
|
||||
[travel]
|
||||
|
|
@ -130,9 +198,12 @@ retraction_hop_after_extruder_switch
|
|||
[cooling]
|
||||
cool_fan_enabled
|
||||
cool_fan_speed
|
||||
cool_fan_speed_min
|
||||
cool_fan_speed_max
|
||||
cool_min_layer_time_fan_speed_max
|
||||
cool_fan_speed_0
|
||||
cool_fan_full_at_height
|
||||
cool_fan_full_layer
|
||||
cool_min_layer_time
|
||||
cool_min_speed
|
||||
cool_lift_head
|
||||
|
|
@ -140,12 +211,21 @@ cool_lift_head
|
|||
[support]
|
||||
support_enable
|
||||
support_extruder_nr
|
||||
support_infill_extruder_nr
|
||||
support_extruder_nr_layer_0
|
||||
support_interface_extruder_nr
|
||||
support_roof_extruder_nr
|
||||
support_bottom_extruder_nr
|
||||
support_type
|
||||
support_angle
|
||||
support_pattern
|
||||
zig_zaggify_support
|
||||
support_connect_zigzags
|
||||
support_infill_rate
|
||||
support_line_distance
|
||||
support_z_distance
|
||||
support_top_distance
|
||||
support_bottom_distance
|
||||
support_xy_distance
|
||||
support_xy_overrides_z
|
||||
support_xy_distance_overhang
|
||||
|
|
@ -157,9 +237,15 @@ support_infill_sparse_thickness
|
|||
gradual_support_infill_steps
|
||||
gradual_support_infill_step_height
|
||||
support_interface_enable
|
||||
support_roof_enable
|
||||
support_bottom_enable
|
||||
support_interface_height
|
||||
support_roof_height
|
||||
support_bottom_height
|
||||
support_interface_skip_height
|
||||
support_interface_density
|
||||
support_roof_density
|
||||
support_bottom_density
|
||||
support_interface_pattern
|
||||
support_use_towers
|
||||
support_tower_diameter
|
||||
|
|
@ -169,19 +255,17 @@ support_mesh_drop_down
|
|||
|
||||
[platform_adhesion]
|
||||
prime_blob_enable
|
||||
extruder_prime_pos_x
|
||||
extruder_prime_pos_y
|
||||
adhesion_type
|
||||
adhesion_extruder_nr
|
||||
skirt_line_count
|
||||
skirt_gap
|
||||
skirt_brim_minimal_length
|
||||
brim_width
|
||||
brim_line_count
|
||||
brim_outside_only
|
||||
raft_margin
|
||||
raft_smoothing
|
||||
raft_airgap
|
||||
layer_0_z_overlap
|
||||
raft_surface_layers
|
||||
raft_surface_thickness
|
||||
raft_surface_line_width
|
||||
|
|
@ -199,8 +283,10 @@ raft_fan_speed
|
|||
|
||||
[dual]
|
||||
prime_tower_enable
|
||||
prime_tower_circular
|
||||
prime_tower_size
|
||||
prime_tower_min_volume
|
||||
prime_tower_wall_thickness
|
||||
prime_tower_position_x
|
||||
prime_tower_position_y
|
||||
prime_tower_flow
|
||||
|
|
@ -238,8 +324,25 @@ smooth_spiralized_contours
|
|||
relative_extrusion
|
||||
|
||||
[experimental]
|
||||
support_tree_enable
|
||||
support_tree_angle
|
||||
support_tree_branch_distance
|
||||
support_tree_branch_diameter
|
||||
support_tree_branch_diameter_angle
|
||||
support_tree_collision_resolution
|
||||
support_tree_wall_thickness
|
||||
support_tree_wall_count
|
||||
slicing_tolerance
|
||||
roofing_line_width
|
||||
roofing_pattern
|
||||
roofing_angles
|
||||
infill_enable_travel_optimization
|
||||
material_flow_dependent_temperature
|
||||
material_flow_temp_graph
|
||||
meshfix_maximum_resolution
|
||||
support_skip_some_zags
|
||||
support_skip_zag_per_mm
|
||||
support_zag_skip_count
|
||||
draft_shield_enabled
|
||||
draft_shield_dist
|
||||
draft_shield_height_limitation
|
||||
|
|
@ -267,19 +370,34 @@ infill_hollow
|
|||
magic_fuzzy_skin_enabled
|
||||
magic_fuzzy_skin_thickness
|
||||
magic_fuzzy_skin_point_density
|
||||
magic_fuzzy_skin_point_dist
|
||||
flow_rate_max_extrusion_offset
|
||||
flow_rate_extrusion_offset_factor
|
||||
infill_enable_travel_optimization
|
||||
material_flow_dependent_temperature
|
||||
material_flow_temp_graph
|
||||
meshfix_maximum_resolution
|
||||
roofing_angles
|
||||
roofing_pattern
|
||||
slicing_tolerance
|
||||
support_tree_angle
|
||||
support_tree_branch_diameter
|
||||
support_tree_branch_diameter_angle
|
||||
support_tree_branch_distance
|
||||
support_tree_collision_resolution
|
||||
support_tree_enable
|
||||
support_tree_wall_thickness
|
||||
wireframe_enabled
|
||||
wireframe_height
|
||||
wireframe_roof_inset
|
||||
wireframe_printspeed
|
||||
wireframe_printspeed_bottom
|
||||
wireframe_printspeed_up
|
||||
wireframe_printspeed_down
|
||||
wireframe_printspeed_flat
|
||||
wireframe_flow
|
||||
wireframe_flow_connection
|
||||
wireframe_flow_flat
|
||||
wireframe_top_delay
|
||||
wireframe_bottom_delay
|
||||
wireframe_flat_delay
|
||||
wireframe_up_half_speed
|
||||
wireframe_top_jump
|
||||
wireframe_fall_down
|
||||
wireframe_drag_along
|
||||
wireframe_strategy
|
||||
wireframe_straight_before_down
|
||||
wireframe_roof_fall_down
|
||||
wireframe_roof_drag_along
|
||||
wireframe_roof_outer_delay
|
||||
wireframe_nozzle_clearance
|
||||
adaptive_layer_height_enabled
|
||||
adaptive_layer_height_variation
|
||||
adaptive_layer_height_variation_step
|
||||
adaptive_layer_height_threshold
|
||||
|
|
|
|||
|
|
@ -236,6 +236,16 @@ Item
|
|||
onTriggered: CuraActions.deleteSelection();
|
||||
}
|
||||
|
||||
Action //Also add backspace as the same function as delete because on Macintosh keyboards the button called "delete" is actually a backspace, and the user expects it to function as a delete.
|
||||
{
|
||||
id: backspaceSelectionAction
|
||||
text: catalog.i18ncp("@action:inmenu menubar:edit", "Delete &Selected Model", "Delete &Selected Models", UM.Selection.selectionCount)
|
||||
enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection
|
||||
iconName: "edit-delete"
|
||||
shortcut: StandardKey.Backspace
|
||||
onTriggered: CuraActions.deleteSelection()
|
||||
}
|
||||
|
||||
Action
|
||||
{
|
||||
id: centerSelectionAction;
|
||||
|
|
|
|||
|
|
@ -490,6 +490,14 @@ UM.MainWindow
|
|||
collapseSidebarAnimation.start();
|
||||
}
|
||||
}
|
||||
|
||||
MouseArea
|
||||
{
|
||||
visible: UM.Controller.activeStage.sidebarComponent != ""
|
||||
anchors.fill: parent
|
||||
acceptedButtons: Qt.AllButtons
|
||||
onWheel: wheel.accepted = true
|
||||
}
|
||||
}
|
||||
|
||||
UM.MessageStack
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
|
|
@ -12,7 +12,7 @@ Menu
|
|||
id: menu
|
||||
title: "Build plate"
|
||||
|
||||
property Cura.BuildPlateModel buildPlateModel: CuraApplication.getBuildPlateModel()
|
||||
property var buildPlateModel: CuraApplication.getBuildPlateModel()
|
||||
|
||||
Instantiator
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Menu
|
|||
|
||||
property bool shouldShowExtruders: machineExtruderCount.properties.value > 1;
|
||||
|
||||
property Cura.MultiBuildPlateModel multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
|
||||
property var multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
|
||||
|
||||
// Selection-related actions.
|
||||
MenuItem { action: Cura.Actions.centerSelection; }
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
|
|
@ -13,11 +13,11 @@ Menu
|
|||
|
||||
Instantiator
|
||||
{
|
||||
model: Cura.QualityProfilesModel
|
||||
model: Cura.QualityProfilesDropDownMenuModel
|
||||
|
||||
MenuItem
|
||||
{
|
||||
text: (model.layer_height != "") ? model.name + " - " + model.layer_height : model.name
|
||||
text: (model.layer_height != "") ? model.name + " - " + model.layer_height + model.layer_height_unit : model.name
|
||||
checkable: true
|
||||
checked: Cura.MachineManager.activeQualityOrQualityChangesName == model.name
|
||||
exclusiveGroup: group
|
||||
|
|
@ -34,18 +34,18 @@ Menu
|
|||
MenuSeparator
|
||||
{
|
||||
id: customSeparator
|
||||
visible: Cura.CustomQualityProfilesModel.rowCount > 0
|
||||
visible: Cura.CustomQualityProfilesDropDownMenuModel.rowCount > 0
|
||||
}
|
||||
|
||||
Instantiator
|
||||
{
|
||||
id: customProfileInstantiator
|
||||
model: Cura.CustomQualityProfilesModel
|
||||
model: Cura.CustomQualityProfilesDropDownMenuModel
|
||||
|
||||
Connections
|
||||
{
|
||||
target: Cura.CustomQualityProfilesModel
|
||||
onModelReset: customSeparator.visible = Cura.CustomQualityProfilesModel.rowCount() > 0
|
||||
target: Cura.CustomQualityProfilesDropDownMenuModel
|
||||
onModelReset: customSeparator.visible = Cura.CustomQualityProfilesDropDownMenuModel.rowCount() > 0
|
||||
}
|
||||
|
||||
MenuItem
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Menu
|
|||
id: base
|
||||
enabled: !PrintInformation.preSliced
|
||||
|
||||
property Cura.MultiBuildPlateModel multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
|
||||
property var multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
|
||||
|
||||
// main views
|
||||
Instantiator
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ Rectangle
|
|||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: UM.Theme.getColor("lining")
|
||||
|
||||
property bool collapsed: true;
|
||||
property bool collapsed: true
|
||||
|
||||
property Cura.MultiBuildPlateModel multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
|
||||
property var multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
|
||||
|
||||
SystemPalette { id: palette }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2016 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Window 2.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Dialogs 1.2
|
||||
|
||||
|
|
@ -12,6 +12,8 @@ TabView
|
|||
{
|
||||
id: base
|
||||
|
||||
property QtObject materialManager: CuraApplication.getMaterialManager()
|
||||
|
||||
property QtObject properties
|
||||
property var currentMaterialNode: null
|
||||
|
||||
|
|
@ -214,7 +216,8 @@ TabView
|
|||
confirmDiameterChangeDialog.old_approximate_diameter_value = old_approximate_diameter;
|
||||
|
||||
confirmDiameterChangeDialog.open()
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
Cura.ContainerManager.setContainerProperty(base.containerId, "material_diameter", "value", value);
|
||||
base.setMetaDataEntry("approximate_diameter", old_approximate_diameter, getApproximateDiameter(value).toString());
|
||||
base.setMetaDataEntry("properties/diameter", properties.diameter, value);
|
||||
|
|
@ -396,13 +399,15 @@ TabView
|
|||
onEditingFinished: materialPropertyProvider.setPropertyValue("value", value)
|
||||
}
|
||||
|
||||
UM.ContainerPropertyProvider {
|
||||
UM.ContainerPropertyProvider
|
||||
{
|
||||
id: materialPropertyProvider
|
||||
containerId: base.containerId
|
||||
watchedProperties: [ "value" ]
|
||||
key: model.key
|
||||
}
|
||||
UM.ContainerPropertyProvider {
|
||||
UM.ContainerPropertyProvider
|
||||
{
|
||||
id: machinePropertyProvider
|
||||
containerId: Cura.MachineManager.activeDefinitionId
|
||||
watchedProperties: [ "value" ]
|
||||
|
|
@ -497,7 +502,7 @@ TabView
|
|||
}
|
||||
|
||||
// update the values
|
||||
Cura.ContainerManager.setMaterialName(base.currentMaterialNode, new_name)
|
||||
base.materialManager.setMaterialName(base.currentMaterialNode, new_name)
|
||||
materialProperties.name = new_name
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Layouts 1.3
|
||||
import QtQuick.Dialogs 1.2
|
||||
|
|
@ -13,6 +13,8 @@ import Cura 1.0 as Cura
|
|||
Item
|
||||
{
|
||||
id: base
|
||||
|
||||
property QtObject materialManager: CuraApplication.getMaterialManager()
|
||||
property var resetEnabled: false // Keep PreferencesDialog happy
|
||||
|
||||
UM.I18nCatalog { id: catalog; name: "cura"; }
|
||||
|
|
@ -37,12 +39,14 @@ Item
|
|||
|
||||
property var hasCurrentItem: materialListView.currentItem != null
|
||||
|
||||
property var currentItem: { // is soon to be overwritten
|
||||
property var currentItem:
|
||||
{ // is soon to be overwritten
|
||||
var current_index = materialListView.currentIndex;
|
||||
return materialsModel.getItem(current_index);
|
||||
}
|
||||
|
||||
property var isCurrentItemActivated: {
|
||||
property var isCurrentItemActivated:
|
||||
{
|
||||
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
|
||||
const root_material_id = Cura.MachineManager.currentRootMaterialId[extruder_position];
|
||||
return base.currentItem.root_material_id == root_material_id;
|
||||
|
|
@ -51,7 +55,8 @@ Item
|
|||
Row // Button Row
|
||||
{
|
||||
id: buttonRow
|
||||
anchors {
|
||||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
top: titleLabel.bottom
|
||||
|
|
@ -59,11 +64,13 @@ Item
|
|||
height: childrenRect.height
|
||||
|
||||
// Activate button
|
||||
Button {
|
||||
Button
|
||||
{
|
||||
text: catalog.i18nc("@action:button", "Activate")
|
||||
iconName: "list-activate"
|
||||
enabled: !isCurrentItemActivated
|
||||
onClicked: {
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus()
|
||||
|
||||
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
|
||||
|
|
@ -72,44 +79,52 @@ Item
|
|||
}
|
||||
|
||||
// Create button
|
||||
Button {
|
||||
Button
|
||||
{
|
||||
text: catalog.i18nc("@action:button", "Create")
|
||||
iconName: "list-add"
|
||||
onClicked: {
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
base.newRootMaterialIdToSwitchTo = Cura.ContainerManager.createMaterial();
|
||||
base.newRootMaterialIdToSwitchTo = base.materialManager.createMaterial();
|
||||
base.toActivateNewMaterial = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Duplicate button
|
||||
Button {
|
||||
Button
|
||||
{
|
||||
text: catalog.i18nc("@action:button", "Duplicate");
|
||||
iconName: "list-add"
|
||||
enabled: base.hasCurrentItem
|
||||
onClicked: {
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
base.newRootMaterialIdToSwitchTo = Cura.ContainerManager.duplicateMaterial(base.currentItem.container_node);
|
||||
base.newRootMaterialIdToSwitchTo = base.materialManager.duplicateMaterial(base.currentItem.container_node);
|
||||
base.toActivateNewMaterial = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Remove button
|
||||
Button {
|
||||
Button
|
||||
{
|
||||
text: catalog.i18nc("@action:button", "Remove")
|
||||
iconName: "list-remove"
|
||||
enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated
|
||||
onClicked: {
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
confirmRemoveMaterialDialog.open();
|
||||
}
|
||||
}
|
||||
|
||||
// Import button
|
||||
Button {
|
||||
Button
|
||||
{
|
||||
text: catalog.i18nc("@action:button", "Import")
|
||||
iconName: "document-import"
|
||||
onClicked: {
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
importMaterialDialog.open();
|
||||
}
|
||||
|
|
@ -117,10 +132,12 @@ Item
|
|||
}
|
||||
|
||||
// Export button
|
||||
Button {
|
||||
Button
|
||||
{
|
||||
text: catalog.i18nc("@action:button", "Export")
|
||||
iconName: "document-export"
|
||||
onClicked: {
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
exportMaterialDialog.open();
|
||||
}
|
||||
|
|
@ -181,7 +198,7 @@ Item
|
|||
|
||||
onYes:
|
||||
{
|
||||
Cura.ContainerManager.removeMaterial(base.currentItem.container_node);
|
||||
base.materialManager.removeMaterial(base.currentItem.container_node);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -281,7 +298,6 @@ Item
|
|||
}
|
||||
visible: text != ""
|
||||
text: {
|
||||
// OLD STUFF
|
||||
var caption = catalog.i18nc("@action:label", "Printer") + ": " + Cura.MachineManager.activeMachineName;
|
||||
if (Cura.MachineManager.hasVariants)
|
||||
{
|
||||
|
|
@ -343,10 +359,19 @@ Item
|
|||
|
||||
Row
|
||||
{
|
||||
id: materialRow
|
||||
spacing: (UM.Theme.getSize("default_margin").width / 2) | 0
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.right: parent.right
|
||||
|
||||
property bool isItemActivated:
|
||||
{
|
||||
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
|
||||
const root_material_id = Cura.MachineManager.currentRootMaterialId[extruder_position];
|
||||
return model.root_material_id == root_material_id;
|
||||
}
|
||||
|
||||
Rectangle
|
||||
{
|
||||
width: Math.floor(parent.height * 0.8)
|
||||
|
|
@ -360,22 +385,14 @@ Item
|
|||
width: Math.floor((parent.width * 0.3))
|
||||
text: model.material
|
||||
elide: Text.ElideRight
|
||||
font.italic: { // TODO: make it easier
|
||||
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
|
||||
const root_material_id = Cura.MachineManager.currentRootMaterialId[extruder_position];
|
||||
return model.root_material_id == root_material_id
|
||||
}
|
||||
font.italic: materialRow.isItemActivated
|
||||
color: parent.ListView.isCurrentItem ? palette.highlightedText : palette.text;
|
||||
}
|
||||
Label
|
||||
{
|
||||
text: (model.name != model.material) ? model.name : ""
|
||||
elide: Text.ElideRight
|
||||
font.italic: { // TODO: make it easier
|
||||
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
|
||||
const root_material_id = Cura.MachineManager.currentRootMaterialId[extruder_position];
|
||||
return model.root_material_id == root_material_id;
|
||||
}
|
||||
font.italic: materialRow.isItemActivated
|
||||
color: parent.ListView.isCurrentItem ? palette.highlightedText : palette.text;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
|
|
@ -85,7 +85,7 @@ Tab
|
|||
model: Cura.QualitySettingsModel
|
||||
{
|
||||
id: qualitySettings
|
||||
extruderPosition: base.extruderPosition
|
||||
selectedPosition: base.extruderPosition
|
||||
selectedQualityItem: base.qualityItem
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Layouts 1.3
|
||||
import QtQuick.Dialogs 1.2
|
||||
|
|
@ -13,6 +13,8 @@ import Cura 1.0 as Cura
|
|||
Item
|
||||
{
|
||||
id: base
|
||||
|
||||
property QtObject qualityManager: CuraApplication.getQualityManager()
|
||||
property var resetEnabled: false // Keep PreferencesDialog happy
|
||||
property var extrudersModel: Cura.ExtrudersModel {}
|
||||
|
||||
|
|
@ -173,7 +175,7 @@ Item
|
|||
{
|
||||
base.newQualityNameToSelect = newName; // We want to switch to the new profile once it's created
|
||||
base.toActivateNewQuality = true;
|
||||
Cura.ContainerManager.createQualityChanges(newName);
|
||||
base.qualityManager.createQualityChanges(newName);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -222,7 +224,7 @@ Item
|
|||
object: "<new name>"
|
||||
onAccepted:
|
||||
{
|
||||
Cura.ContainerManager.duplicateQualityChanges(newName, base.currentItem);
|
||||
base.qualityManager.duplicateQualityChanges(newName, base.currentItem);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -239,9 +241,9 @@ Item
|
|||
|
||||
onYes:
|
||||
{
|
||||
Cura.ContainerManager.removeQualityChangesGroup(base.currentItem.quality_changes_group);
|
||||
base.qualityManager.removeQualityChangesGroup(base.currentItem.quality_changes_group);
|
||||
// reset current item to the first if available
|
||||
qualityListView.currentIndex = -1; // TODO: Reset selection.
|
||||
qualityListView.currentIndex = -1; // Reset selection.
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -253,7 +255,7 @@ Item
|
|||
object: "<new name>"
|
||||
onAccepted:
|
||||
{
|
||||
var actualNewName = Cura.ContainerManager.renameQualityChangesGroup(base.currentItem.quality_changes_group, newName);
|
||||
var actualNewName = base.qualityManager.renameQualityChangesGroup(base.currentItem.quality_changes_group, newName);
|
||||
base.newQualityNameToSelect = actualNewName; // Select the new name after the model gets updated
|
||||
}
|
||||
}
|
||||
|
|
@ -264,7 +266,7 @@ Item
|
|||
id: importDialog
|
||||
title: catalog.i18nc("@title:window", "Import Profile")
|
||||
selectExisting: true
|
||||
nameFilters: qualitiesModel.getFileNameFilters("profile_reader") // TODO: make this easier
|
||||
nameFilters: qualitiesModel.getFileNameFilters("profile_reader")
|
||||
folder: CuraApplication.getDefaultPath("dialog_profile_path")
|
||||
onAccepted:
|
||||
{
|
||||
|
|
@ -290,11 +292,10 @@ Item
|
|||
id: exportDialog
|
||||
title: catalog.i18nc("@title:window", "Export Profile")
|
||||
selectExisting: false
|
||||
nameFilters: qualitiesModel.getFileNameFilters("profile_writer") // TODO: make this easier
|
||||
nameFilters: qualitiesModel.getFileNameFilters("profile_writer")
|
||||
folder: CuraApplication.getDefaultPath("dialog_profile_path")
|
||||
onAccepted:
|
||||
{
|
||||
// TODO: make this easier
|
||||
var result = Cura.ContainerManager.exportQualityChangesGroup(base.currentItem.quality_changes_group,
|
||||
fileUrl, selectedNameFilter);
|
||||
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ Item
|
|||
TextField
|
||||
{
|
||||
id: filter;
|
||||
|
||||
height: parent.height
|
||||
anchors.left: parent.left
|
||||
anchors.right: clearFilterButton.left
|
||||
anchors.rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width)
|
||||
|
|
|
|||
|
|
@ -515,15 +515,12 @@ Rectangle
|
|||
weights = ["0"];
|
||||
costs = ["0.00"];
|
||||
}
|
||||
var result = lengths.join(" + ") + "m / ~ " + weights.join(" + ") + "g";
|
||||
if(someCostsKnown)
|
||||
{
|
||||
return catalog.i18nc("@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost", "%1m / ~ %2g / ~ %4 %3").arg(lengths.join(" + "))
|
||||
.arg(weights.join(" + ")).arg(costs.join(" + ")).arg(UM.Preferences.getValue("cura/currency"));
|
||||
}
|
||||
else
|
||||
{
|
||||
return catalog.i18nc("@label Print estimates: m for meters, g for grams", "%1m / ~ %2g").arg(lengths.join(" + ")).arg(weights.join(" + "));
|
||||
result += " / ~ " + costs.join(" + ") + " " + UM.Preferences.getValue("cura/currency");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
MouseArea
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2015 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import "Settings"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls.Styles 1.4
|
||||
import QtQuick.Layouts 1.3
|
||||
|
|
@ -58,7 +58,7 @@ Item
|
|||
running: false
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
var item = Cura.QualityProfilesModel.getItem(qualitySlider.value);
|
||||
var item = Cura.QualityProfilesDropDownMenuModel.getItem(qualitySlider.value);
|
||||
Cura.MachineManager.activeQualityGroup = item.quality_group;
|
||||
}
|
||||
}
|
||||
|
|
@ -103,8 +103,8 @@ Item
|
|||
var availableMin = -1
|
||||
var availableMax = -1
|
||||
|
||||
for (var i = 0; i < Cura.QualityProfilesModel.rowCount(); i++) {
|
||||
var qualityItem = Cura.QualityProfilesModel.getItem(i)
|
||||
for (var i = 0; i < Cura.QualityProfilesDropDownMenuModel.rowCount(); i++) {
|
||||
var qualityItem = Cura.QualityProfilesDropDownMenuModel.getItem(i)
|
||||
|
||||
// Add each quality item to the UI quality model
|
||||
qualityModel.append(qualityItem)
|
||||
|
|
@ -166,7 +166,7 @@ Item
|
|||
qualityModel.existingQualityProfile = 0
|
||||
|
||||
// check, the ticks count cannot be less than zero
|
||||
qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesModel.rowCount() - 1)
|
||||
qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesDropDownMenuModel.rowCount() - 1)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -192,13 +192,13 @@ Item
|
|||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height / 2)
|
||||
color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
|
||||
color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesDropDownMenuModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
|
||||
text:
|
||||
{
|
||||
var result = ""
|
||||
if(Cura.MachineManager.activeMachine != null)
|
||||
{
|
||||
result = Cura.QualityProfilesModel.getItem(index).layer_height_without_unit
|
||||
result = Cura.QualityProfilesDropDownMenuModel.getItem(index).layer_height
|
||||
|
||||
if(result == undefined)
|
||||
{
|
||||
|
|
@ -263,7 +263,7 @@ Item
|
|||
Rectangle
|
||||
{
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color: Cura.QualityProfilesModel.getItem(index).available ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
|
||||
color: Cura.QualityProfilesDropDownMenuModel.getItem(index).available ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
|
||||
width: 1 * screenScaleFactor
|
||||
height: 6 * screenScaleFactor
|
||||
y: 0
|
||||
|
|
@ -401,9 +401,9 @@ Item
|
|||
// if the current profile is user-created, switch to a built-in quality
|
||||
if (Cura.SimpleModeSettingsManager.isProfileUserCreated)
|
||||
{
|
||||
if (Cura.QualityProfilesModel.rowCount() > 0)
|
||||
if (Cura.QualityProfilesDropDownMenuModel.rowCount() > 0)
|
||||
{
|
||||
var item = Cura.QualityProfilesModel.getItem(0);
|
||||
var item = Cura.QualityProfilesDropDownMenuModel.getItem(0);
|
||||
Cura.MachineManager.activeQualityGroup = item.quality_group;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fast
|
||||
definition = abax_pri3
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = fast
|
||||
weight = -1
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.2
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Extra Fine
|
||||
definition = abax_pri3
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.1
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = abax_pri3
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
layer_height = 0.2
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fast
|
||||
name = Fine
|
||||
definition = abax_pri3
|
||||
|
||||
[metadata]
|
||||
setting_version = 4
|
||||
type = quality
|
||||
quality_type = fast
|
||||
quality_type = normal
|
||||
weight = -1
|
||||
material = generic_pla
|
||||
|
||||
[values]
|
||||
layer_height = 0.2
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.8
|
||||
infill_sparse_density = 20
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ weight = 1
|
|||
material = generic_pla
|
||||
|
||||
[values]
|
||||
layer_height = 0.1
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.8
|
||||
infill_sparse_density = 20
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ weight = 0
|
|||
material = generic_pla
|
||||
|
||||
[values]
|
||||
layer_height = 0.2
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.8
|
||||
infill_sparse_density = 20
|
||||
|
|
|
|||
|
|
@ -12,9 +12,10 @@ material = fabtotum_abs
|
|||
|
||||
[values]
|
||||
adhesion_type = raft
|
||||
speed_print = 80
|
||||
layer_height = 0.2
|
||||
layer_height_0 = 0.2
|
||||
cool_fan_enabled = True
|
||||
cool_fan_enabled = False
|
||||
cool_fan_full_at_height = 0.4
|
||||
cool_fan_speed = 50
|
||||
cool_fan_speed_max = 50
|
||||
|
|
|
|||
|
|
@ -12,9 +12,10 @@ material = fabtotum_abs
|
|||
|
||||
[values]
|
||||
adhesion_type = raft
|
||||
speed_print = 45
|
||||
layer_height = 0.1
|
||||
layer_height_0 = 0.1
|
||||
cool_fan_enabled = True
|
||||
cool_fan_enabled = False
|
||||
cool_fan_full_at_height = 0.2
|
||||
cool_fan_speed = 50
|
||||
cool_fan_speed_max = 50
|
||||
|
|
|
|||
|
|
@ -12,9 +12,10 @@ material = fabtotum_abs
|
|||
|
||||
[values]
|
||||
adhesion_type = raft
|
||||
speed_print = 60
|
||||
layer_height = 0.15
|
||||
layer_height_0 = 0.15
|
||||
cool_fan_enabled = True
|
||||
cool_fan_enabled = False
|
||||
cool_fan_full_at_height = 0.3
|
||||
cool_fan_speed = 50
|
||||
cool_fan_speed_max = 50
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ skirt_gap = 1.5
|
|||
skirt_line_count = 5
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 25
|
||||
speed_print = 50
|
||||
speed_print = 30
|
||||
speed_topbottom = 40
|
||||
speed_travel = 200
|
||||
speed_wall_0 = 40
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ skirt_gap = 1.5
|
|||
skirt_line_count = 5
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 25
|
||||
speed_print = 50
|
||||
speed_print = 30
|
||||
speed_topbottom = 40
|
||||
speed_travel = 200
|
||||
speed_wall_0 = 40
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ skirt_gap = 1.5
|
|||
skirt_line_count = 5
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 25
|
||||
speed_print = 50
|
||||
speed_print = 30
|
||||
speed_topbottom = 40
|
||||
speed_travel = 200
|
||||
speed_wall_0 = 40
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = fabtotum_pla
|
|||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
speed_print = 80
|
||||
layer_height = 0.2
|
||||
layer_height_0 = 0.2
|
||||
cool_fan_enabled = True
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = fabtotum_pla
|
|||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
speed_print = 45
|
||||
layer_height = 0.1
|
||||
layer_height_0 = 0.1
|
||||
cool_fan_enabled = True
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = fabtotum_pla
|
|||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
speed_print = 60
|
||||
layer_height = 0.15
|
||||
layer_height_0 = 0.15
|
||||
cool_fan_enabled = True
|
||||
|
|
|
|||
25
resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg
Normal file
25
resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
[general]
|
||||
version = 2
|
||||
definition = fabtotum
|
||||
name = Fast Quality
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
setting_version = 4
|
||||
material = fabtotum_tpu
|
||||
quality_type = fast
|
||||
weight = -1
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
speed_print = 80
|
||||
layer_height = 0.2
|
||||
layer_height_0 = 0.2
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = 0.4
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 100
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
|
||||
24
resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg
Normal file
24
resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
[general]
|
||||
version = 2
|
||||
definition = fabtotum
|
||||
name = High Quality
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
setting_version = 4
|
||||
material = fabtotum_tpu
|
||||
quality_type = high
|
||||
weight = 1
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
layer_height = 0.1
|
||||
layer_height_0 = 0.1
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = 0.2
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 100
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
|
||||
25
resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg
Normal file
25
resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
[general]
|
||||
version = 2
|
||||
definition = fabtotum
|
||||
name = Normal Quality
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
setting_version = 4
|
||||
material = fabtotum_TPU
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
speed_print = 80
|
||||
layer_height = 0.15
|
||||
layer_height_0 = 0.15
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = 0.3
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 100
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
|
||||
|
|
@ -12,6 +12,7 @@ material = generic_petg
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_petg
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_petg
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_petg
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_pla
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_pla
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_pla
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_pla
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_pla
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_pla
|
|||
variant = 0.4 mm 2-fans
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ material = generic_pla
|
|||
variant = 0.4 mm
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
bottom_thickness = 0.6
|
||||
coasting_enable = True
|
||||
coasting_speed = 95
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ retraction_extrusion_window = 1
|
|||
retraction_hop = 1.5
|
||||
retraction_hop_enabled = True
|
||||
retraction_hop_only_when_collides = True
|
||||
retraction_min_travel = 0.8
|
||||
retraction_min_travel = =line_width * 2
|
||||
retraction_prime_speed = 15
|
||||
skin_overlap = 5
|
||||
speed_equalize_flow_enabled = True
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ retraction_extrusion_window = 1
|
|||
retraction_hop = 1.5
|
||||
retraction_hop_enabled = True
|
||||
retraction_hop_only_when_collides = True
|
||||
retraction_min_travel = 0.8
|
||||
retraction_min_travel = =line_width * 2
|
||||
retraction_prime_speed = 15
|
||||
skin_overlap = 5
|
||||
speed_equalize_flow_enabled = True
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ retraction_extrusion_window = 1
|
|||
retraction_hop = 1.5
|
||||
retraction_hop_enabled = True
|
||||
retraction_hop_only_when_collides = True
|
||||
retraction_min_travel = 0.8
|
||||
retraction_min_travel = =line_width * 2
|
||||
retraction_prime_speed = 15
|
||||
skin_overlap = 5
|
||||
speed_equalize_flow_enabled = True
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ retraction_count_max = 12
|
|||
retraction_extra_prime_amount = 0.5
|
||||
retraction_hop = 1.5
|
||||
retraction_hop_only_when_collides = False
|
||||
retraction_min_travel = 0.8
|
||||
retraction_min_travel = =line_width * 2
|
||||
retraction_prime_speed = 15
|
||||
skin_line_width = =round(line_width * 0.78 / 0.8, 2)
|
||||
speed_print = 30
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ retraction_count_max = 12
|
|||
retraction_extra_prime_amount = 0.5
|
||||
retraction_hop = 1.5
|
||||
retraction_hop_only_when_collides = False
|
||||
retraction_min_travel = 0.8
|
||||
retraction_min_travel = =line_width * 2
|
||||
retraction_prime_speed = 15
|
||||
skin_line_width = =round(line_width * 0.78 / 0.8, 2)
|
||||
speed_print = 30
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ retraction_count_max = 12
|
|||
retraction_extra_prime_amount = 0.5
|
||||
retraction_hop = 1.5
|
||||
retraction_hop_only_when_collides = False
|
||||
retraction_min_travel = 0.8
|
||||
retraction_min_travel = =line_width * 2
|
||||
retraction_prime_speed = 15
|
||||
skin_line_width = =round(line_width * 0.78 / 0.8, 2)
|
||||
speed_print = 30
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = cartesio
|
||||
|
||||
[metadata]
|
||||
author = Cartesio
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = cartesio
|
||||
|
||||
[metadata]
|
||||
author = Cartesio
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = cartesio
|
||||
|
||||
[metadata]
|
||||
author = Cartesio
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = fabtotum
|
||||
|
||||
[metadata]
|
||||
author = FABtotum
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = fabtotum
|
||||
|
||||
[metadata]
|
||||
author = FABtotum
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = fabtotum
|
||||
|
||||
[metadata]
|
||||
author = FABtotum
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = fabtotum
|
||||
|
||||
[metadata]
|
||||
author = FABtotum
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = fabtotum
|
||||
|
||||
[metadata]
|
||||
author = FABtotum
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = fabtotum
|
||||
|
||||
[metadata]
|
||||
author = FABtotum
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = fabtotum
|
||||
|
||||
[metadata]
|
||||
author = FABtotum
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus_dual
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus_dual
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus_dual
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus_dual
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus_dual
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus_dual
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = gmax15plus_dual
|
||||
|
||||
[metadata]
|
||||
author = gcreate
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
author = IMADE3D
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ version = 2
|
|||
definition = imade3d_jellybox
|
||||
|
||||
[metadata]
|
||||
author = IMADE3D
|
||||
setting_version = 4
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue