Merge remote-tracking branch 'origin/CURA-12261-3dconnectionmouse' into CURA-12261-3dconnectionmouse

resources/definitions/fdmprinter.def.json

@@ -4413,7 +4413,8 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "retraction_combing_avoid_distance": {
+                "retraction_combing_avoid_distance":
+                {
                     "label": "Inside Travel Avoid Distance",
                     "description": "The distance between the nozzle and already printed outer walls when travelling inside a model.",
                     "unit": "mm",
@@ -7501,7 +7502,8 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "interlocking_enable": {
+                "interlocking_enable":
+                {
                     "label": "Generate Interlocking Structure",
                     "description": "At the locations where models touch, generate an interlocking beam structure. This improves the adhesion between models, especially models printed in different materials.",
                     "type": "bool",
@@ -7511,7 +7513,8 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
-                "interlocking_beam_width": {
+                "interlocking_beam_width":
+                {
                     "label": "Interlocking Beam Width",
                     "description": "The width of the interlocking structure beams.",
                     "type": "float",
@@ -7525,7 +7528,8 @@
                     "settable_per_mesh": true,
                     "settable_per_extruder": true
                 },
-                "interlocking_orientation": {
+                "interlocking_orientation":
+                {
                     "label": "Interlocking Structure Orientation",
                     "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.",
                     "unit": "\u00b0",
@@ -7538,7 +7542,8 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
-                "interlocking_beam_layer_count": {
+                "interlocking_beam_layer_count":
+                {
                     "label": "Interlocking Beam Layer Count",
                     "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.",
                     "type": "int",
@@ -7550,7 +7555,8 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
-                "interlocking_depth": {
+                "interlocking_depth":
+                {
                     "label": "Interlocking Depth",
                     "description": "The distance from the boundary between models to generate interlocking structure, measured in cells. Too few cells will result in poor adhesion.",
                     "type": "int",
@@ -7563,7 +7569,8 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
-                "interlocking_boundary_avoidance": {
+                "interlocking_boundary_avoidance":
+                {
                     "label": "Interlocking Boundary Avoidance",
                     "description": "The distance from the outside of a model where interlocking structures will not be generated, measured in cells.",
                     "type": "int",

resources/definitions/ultimaker.def.json

@@ -42,9 +42,7 @@
         "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 5" },
         "cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" },
         "cool_min_temperature": { "value": "max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15])" },
-      "extra_infill_lines_to_support_skins": {
+        "extra_infill_lines_to_support_skins": { "value": "'none'" },
-        "value": "'none'"
-      },
         "gradual_support_infill_step_height": { "value": "4 * layer_height" },
         "gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" },
         "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" },
@@ -112,9 +110,7 @@
         "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]" },
-      "skin_edge_support_thickness": {
+        "skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" },
-        "value": "4 * layer_height if infill_sparse_density < 30 else 0"
-      },
         "skin_material_flow": { "value": "0.95 * material_flow" },
         "skin_material_flow_layer_0": { "value": "95" },
         "skin_monotonic": { "value": "roofing_layer_count == 0" },

resources/definitions/ultimaker_method_base.def.json

@@ -142,7 +142,8 @@
             "value": "min(extruderValues('extruder_nr'))"
         },
         "adhesion_type": { "value": "'raft'" },
-      "bottom_thickness": {
+        "bottom_thickness":
+        {
             "minimum_value_warning": 0.3,
             "value": "top_bottom_thickness"
         },
@@ -579,7 +580,8 @@
             "minimum_value_warning": 0.3,
             "value": "4*layer_height"
         },
-      "top_thickness": {
+        "top_thickness":
+        {
             "minimum_value_warning": 0.3,
             "value": "top_bottom_thickness * 1.5"
         },

resources/definitions/ultimaker_original.def.json

@@ -68,9 +68,7 @@
         "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y50 F9000\n;Put printing message on LCD screen\nM117 Printing..." },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": true },
         "machine_width": { "default_value": 205 },
-      "material_print_temp_wait": {
+        "material_print_temp_wait": { "value": true },
-        "value": true
-      },
         "speed_slowdown_layers": { "value": 2 }
     }
 }