diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json index f0c786a393..22eb06af67 100644 --- a/resources/definitions/anycubic_i3_mega_s.def.json +++ b/resources/definitions/anycubic_i3_mega_s.def.json @@ -78,7 +78,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature + 10" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "infill_sparse_density": { "value": 25 }, "infill_before_walls": { "value": false }, @@ -91,21 +90,21 @@ "retraction_hop_enabled": { "value": true }, "retraction_hop": { "value": 0.075 }, - "retraction_hop_only_when_collides": { "value": true }, + "retraction_hop_only_when_collides": { "value": true }, "retraction_combing": { "value": "'off'" }, "retraction_combing_max_distance": { "value": 30 }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - - "retraction_amount": { "value": 6 }, + + "retraction_amount": { "value": 6 }, "retraction_enable": { "value": true }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_speed": { "value": 70 }, - "cool_fan_speed_0": { "value": 30 }, + "cool_fan_speed": { "value": 70 }, + "cool_fan_speed_0": { "value": 30 }, "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, @@ -115,7 +114,6 @@ "skirt_gap": { "value": 5.0 }, "skirt_line_count": { "value": 4 }, - "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, @@ -129,8 +127,8 @@ "support_brim_width": { "value": 4 }, "support_interface_enable": { "value": true }, - "support_structure": { "value": "'tree'" }, - "support_type": { "value": "'buildplate' if support_structure == 'tree' else 'everywhere'" }, + "support_structure": { "value": "'tree'" }, + "support_type": { "value": "'buildplate' if support_structure == 'tree' else 'everywhere'" }, "support_interface_height": { "value": "layer_height * 4" }, "support_interface_density": { "value": 33.333 }, "support_interface_pattern": { "value": "'grid'" }, diff --git a/resources/definitions/longer_base.def.json b/resources/definitions/longer_base.def.json index d1638fda75..3b59891eb7 100644 --- a/resources/definitions/longer_base.def.json +++ b/resources/definitions/longer_base.def.json @@ -84,7 +84,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, @@ -97,7 +96,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 76ed115a57..8e86f6bd7d 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -88,9 +88,6 @@ "wall_0_wipe_dist": { "value": 0.05 }, "optimize_wall_printing_order": { "value": "True" }, - "travel_compensate_overlapping_walls_enabled": { "value": "False" }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, - "travel_compensate_overlapping_walls_x_enabled": { "value": "False" }, "infill_sparse_density": { "value": 16 }, "infill_wipe_dist": { "value": 0 }, diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index f46213dde7..23b3b7bc7a 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -110,9 +110,6 @@ "switch_extruder_retraction_speed": { "value": "30" }, - "travel_compensate_overlapping_walls_enabled": { - "default_value": false - }, "raft_base_acceleration": { "value": "400" }, @@ -389,9 +386,6 @@ "acceleration_support_infill": { "value": "400" }, - "travel_compensate_overlapping_walls_0_enabled": { - "value": "False" - }, "support_bottom_material_flow": { "value": "99" }, @@ -644,9 +638,6 @@ "skirt_line_count": { "default_value": 2 }, - "travel_compensate_overlapping_walls_x_enabled": { - "value": "False" - }, "jerk_wall_0": { "value": "5" }, diff --git a/resources/definitions/two_trees_base.def.json b/resources/definitions/two_trees_base.def.json index faeb4950b2..52387b5f9b 100644 --- a/resources/definitions/two_trees_base.def.json +++ b/resources/definitions/two_trees_base.def.json @@ -31,8 +31,7 @@ "machine_heated_bed": { "default_value": true }, "material_diameter": { "default_value": 1.75 }, - - + "speed_print": { "value": 50.0 } , "speed_infill": { "value": "speed_print" }, "speed_wall": { "value": "speed_print / 2" }, @@ -64,11 +63,9 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, - "retraction_hop_enabled": { "value": "False" }, "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, @@ -121,6 +118,5 @@ "minimum_interface_area": { "value": 10 }, "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, "wall_thickness": {"value": "line_width * 2" } - } } diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg index d6d2535bac..d487a20e00 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg index 969bef06ba..410847f04c 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg index 8e6916f4ae..1c9c6416d7 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg index a39c876f96..37c751bdbe 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg index b3a25a258d..37a87e7c37 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg index b3a25a258d..37a87e7c37 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg index db3607801e..f2d71aac53 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg index 0529516e35..7b470f8bfc 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg index 6e6bd391d5..ab0a078b78 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg index 51e511e2e1..becbceb62e 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg index ee5cbfaaf2..7c713d9d97 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg index f212c4180a..9274072c50 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg index a7060948ed..72ba3b1b7c 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg index f7bd2425fb..257b2fca78 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 9198f390fc..aaba22e70a 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -23,7 +23,6 @@ wall_x_extruder_nr wall_thickness wall_line_count optimize_wall_printing_order -fill_perimeter_gaps xy_offset [top_bottom]