diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index edd31758b0..4a70851e33 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "ankermake_m5_platform.obj", "has_machine_quality": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, "platform_texture": "ankermake_m5.png", "preferred_material": "generic_pla", diff --git a/resources/definitions/ankermake_m5c.def.json b/resources/definitions/ankermake_m5c.def.json index 631cb20f06..131bd6bd7a 100644 --- a/resources/definitions/ankermake_m5c.def.json +++ b/resources/definitions/ankermake_m5c.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "ankermake_m5c_platform.obj", "has_machine_quality": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "ankermake_m5c_extruder_0" }, "platform_texture": "ankermake_m5c.png", "preferred_material": "generic_pla", diff --git a/resources/definitions/dagoma_sigma_pro.def.json b/resources/definitions/dagoma_sigma_pro.def.json index 295fe49662..3f39c9f713 100644 --- a/resources/definitions/dagoma_sigma_pro.def.json +++ b/resources/definitions/dagoma_sigma_pro.def.json @@ -11,7 +11,7 @@ "platform": "dagoma_sigma_pro.obj", "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "has_variants": true, "machine_extruder_trains": { "0": "dagoma_sigma_pro_extruder" }, "platform_texture": "dagoma_sigma_pro.png", diff --git a/resources/definitions/dagoma_sigma_pro_dual.def.json b/resources/definitions/dagoma_sigma_pro_dual.def.json index fccb9b5665..cd1702228c 100644 --- a/resources/definitions/dagoma_sigma_pro_dual.def.json +++ b/resources/definitions/dagoma_sigma_pro_dual.def.json @@ -11,7 +11,7 @@ "platform": "dagoma_sigma_pro.obj", "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "has_variants": true, "machine_extruder_trains": { diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index d8c20fb021..f4ad1dd03e 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 252acccdae..e76d923909 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 9b3ddcc01f..98e35f46e1 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 391358fce7..110ea1efb5 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_potter_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index b98507a101..d4ae902fa6 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, - "preferred_material": "eazao_clay", + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index fc3b75ab88..c1392e57ba 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/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", diff --git a/resources/definitions/flyingbear_ghost_4s.def.json b/resources/definitions/flyingbear_ghost_4s.def.json index 164f1dc942..807d036523 100644 --- a/resources/definitions/flyingbear_ghost_4s.def.json +++ b/resources/definitions/flyingbear_ghost_4s.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "oducceu", "platform": "flyingbear_platform.obj", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "flyingbear_platform.png", "quality_definition": "flyingbear_base" }, diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json index 49381e5bb2..b72a3a18fd 100644 --- a/resources/definitions/flyingbear_ghost_5.def.json +++ b/resources/definitions/flyingbear_ghost_5.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "oducceu", "platform": "flyingbear_platform.obj", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "flyingbear_platform.png", "quality_definition": "flyingbear_base" }, diff --git a/resources/definitions/flyingbear_ghost_6.def.json b/resources/definitions/flyingbear_ghost_6.def.json index ab9234aa6d..8c5287cb4e 100644 --- a/resources/definitions/flyingbear_ghost_6.def.json +++ b/resources/definitions/flyingbear_ghost_6.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "barrnet", "platform": "flyingbear_platform.obj", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "flyingbear_platform.png", "quality_definition": "flyingbear_base" }, diff --git a/resources/definitions/hellbot_adonis.def.json b/resources/definitions/hellbot_adonis.def.json index e4bd1672b0..2a7022e7c1 100644 --- a/resources/definitions/hellbot_adonis.def.json +++ b/resources/definitions/hellbot_adonis.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_adonis.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_adonis_extruder" }, "platform_offset": [ 0, diff --git a/resources/definitions/hellbot_hidra.def.json b/resources/definitions/hellbot_hidra.def.json index f999304e17..fe1d580354 100644 --- a/resources/definitions/hellbot_hidra.def.json +++ b/resources/definitions/hellbot_hidra.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_hidra.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_hidra_extruder_0", diff --git a/resources/definitions/hellbot_hidra_plus.def.json b/resources/definitions/hellbot_hidra_plus.def.json index a8c2f0b033..dc718dc5f2 100644 --- a/resources/definitions/hellbot_hidra_plus.def.json +++ b/resources/definitions/hellbot_hidra_plus.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_hidra_plus.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_hidra_plus_extruder_0", diff --git a/resources/definitions/hellbot_magna_2_230.def.json b/resources/definitions/hellbot_magna_2_230.def.json index 4633197354..c2e200b100 100644 --- a/resources/definitions/hellbot_magna_2_230.def.json +++ b/resources/definitions/hellbot_magna_2_230.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_230.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_230_extruder_0" }, "platform_texture": "Magna2_230.png" }, diff --git a/resources/definitions/hellbot_magna_2_230_dual.def.json b/resources/definitions/hellbot_magna_2_230_dual.def.json index 8c913f399d..3ba073d89b 100644 --- a/resources/definitions/hellbot_magna_2_230_dual.def.json +++ b/resources/definitions/hellbot_magna_2_230_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_230.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_230_dual_extruder_0", diff --git a/resources/definitions/hellbot_magna_2_300.def.json b/resources/definitions/hellbot_magna_2_300.def.json index cb98d2a209..565119e31f 100644 --- a/resources/definitions/hellbot_magna_2_300.def.json +++ b/resources/definitions/hellbot_magna_2_300.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_300.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_300_extruder_0" }, "platform_texture": "Magna2_300.png" }, diff --git a/resources/definitions/hellbot_magna_2_300_dual.def.json b/resources/definitions/hellbot_magna_2_300_dual.def.json index 4693ecd711..9e0e72f145 100644 --- a/resources/definitions/hellbot_magna_2_300_dual.def.json +++ b/resources/definitions/hellbot_magna_2_300_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_300.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_300_dual_extruder_0", diff --git a/resources/definitions/hellbot_magna_2_400.def.json b/resources/definitions/hellbot_magna_2_400.def.json index 376489ddd4..8bc7c21811 100644 --- a/resources/definitions/hellbot_magna_2_400.def.json +++ b/resources/definitions/hellbot_magna_2_400.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_400.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_400_extruder_0" }, "platform_texture": "Magna2_400.png" }, diff --git a/resources/definitions/hellbot_magna_2_400_dual.def.json b/resources/definitions/hellbot_magna_2_400_dual.def.json index 0adf575bca..00f10c1117 100644 --- a/resources/definitions/hellbot_magna_2_400_dual.def.json +++ b/resources/definitions/hellbot_magna_2_400_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_400.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_400_dual_extruder_0", diff --git a/resources/definitions/hellbot_magna_2_500.def.json b/resources/definitions/hellbot_magna_2_500.def.json index 6d3324bacd..fe83fab70a 100644 --- a/resources/definitions/hellbot_magna_2_500.def.json +++ b/resources/definitions/hellbot_magna_2_500.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_500.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_500_extruder_0" }, "platform_texture": "Magna2_500.png" }, diff --git a/resources/definitions/hellbot_magna_2_500_dual.def.json b/resources/definitions/hellbot_magna_2_500_dual.def.json index 4f3a2d2c13..a8f6fc5b37 100644 --- a/resources/definitions/hellbot_magna_2_500_dual.def.json +++ b/resources/definitions/hellbot_magna_2_500_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_500.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_2_500_dual_extruder_0", diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json index ec463b42f8..7425aa3db4 100644 --- a/resources/definitions/hellbot_magna_I.def.json +++ b/resources/definitions/hellbot_magna_I.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_i_extruder" }, "platform_offset": [ 0, diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json index 0b5fb5c8cf..a449a60f01 100644 --- a/resources/definitions/hellbot_magna_SE.def.json +++ b/resources/definitions/hellbot_magna_SE.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_magna_SE.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_extruder" }, "platform_texture": "hellbot_magna_SE.png" }, diff --git a/resources/definitions/hellbot_magna_SE_300.def.json b/resources/definitions/hellbot_magna_SE_300.def.json index efcb9b7f00..bb83df4a37 100644 --- a/resources/definitions/hellbot_magna_SE_300.def.json +++ b/resources/definitions/hellbot_magna_SE_300.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_SE_300.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_300_extruder" }, "platform_texture": "Hellbot_Magna_SE_300.png" }, diff --git a/resources/definitions/hellbot_magna_SE_Pro.def.json b/resources/definitions/hellbot_magna_SE_Pro.def.json index 8382e9bd32..aa71aab37b 100644 --- a/resources/definitions/hellbot_magna_SE_Pro.def.json +++ b/resources/definitions/hellbot_magna_SE_Pro.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_SE_Pro.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_Pro_extruder" }, "platform_texture": "Hellbot_magna_SE_Pro.png" }, diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index fda4b11794..9488ec2a43 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_dual_extruder_1", diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index d9ea444c4a..5bd5258d5a 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -16,8 +16,8 @@ "preferred_material": "generic_pla", "preferred_quality_type": "standard", "preferred_variant_name": "0.4mm", - "variants_name": "Extruder", - "variants_name_has_translation": true + "variants_name": "Extruder", + "variants_name_has_translation": true }, "overrides": { diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index ca518d4b20..d194902e5c 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -12,7 +12,7 @@ "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "koonovo_base_extruder_0" }, "platform_texture": "koonovo.png", "preferred_material": "generic_pla", diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index feb74c4c84..20d3bafa0a 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -11,7 +11,7 @@ "platform": "moai.obj", "has_machine_quality": true, "has_materials": false, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "machine_extruder_trains": { "0": "peopoly_moai_extruder_0" }, "platform_texture": "moai.jpg" }, diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 9bf68f76dc..4876738f6e 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -25,7 +25,7 @@ "preferred_quality_type": "extra_fast", "preferred_variant_name": "0.84mm (Green)", "supported_actions": [], - "variants_name": "Print Core" + "variants_name": "Print Core" }, "overrides": { diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 97a8ee1400..65ceaf6f0f 100644 --- a/resources/definitions/ultimaker.def.json +++ b/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": { - "value": "'none'" - }, + "extra_infill_lines_to_support_skins": { "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": { - "value": "4 * layer_height if infill_sparse_density < 30 else 0" - }, + "skin_edge_support_thickness": { "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" }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 4547916df8..fb8b876fb5 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -51,8 +51,8 @@ "supported_actions": [ "DiscoverUM3Action" ], "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true + "variants_name": "Print Core", + "variants_name_has_translation": true }, "overrides": { diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index 823e12a7a2..bdfd5f93a5 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -36,8 +36,8 @@ "preferred_variant_name": "AA 0.4", "quality_definition": "ultimaker3", "supported_actions": [ "DiscoverUM3Action" ], - "variants_name": "Print Core", - "variants_name_has_translation": true + "variants_name": "Print Core", + "variants_name_has_translation": true }, "overrides": { diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index f37e88e3af..710ee29a40 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -43,8 +43,8 @@ "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true, + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 58876812b7..5e78c3f630 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -83,7 +83,7 @@ "supports_usb_connection": false, "variant_definition": "ultimaker_method", "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 1fc3699cd8..1e5eb952ed 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -26,7 +26,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": @@ -142,10 +142,11 @@ "value": "min(extruderValues('extruder_nr'))" }, "adhesion_type": { "value": "'raft'" }, - "bottom_thickness": { - "minimum_value_warning": 0.3, - "value": "top_bottom_thickness" - }, + "bottom_thickness": + { + "minimum_value_warning": 0.3, + "value": "top_bottom_thickness" + }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, @@ -579,10 +580,11 @@ "minimum_value_warning": 0.3, "value": "4*layer_height" }, - "top_thickness": { - "minimum_value_warning": 0.3, - "value": "top_bottom_thickness * 1.5" - }, + "top_thickness": + { + "minimum_value_warning": 0.3, + "value": "top_bottom_thickness * 1.5" + }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "travel_avoid_other_parts": { "value": false }, "wall_0_inset": { "value": 0 }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index e8a98fde94..37b11ad4ef 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -69,7 +69,7 @@ "supports_usb_connection": false, "variant_definition": "ultimaker_methodx", "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index ea56dc0cc0..d12fa8ac59 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -67,7 +67,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 495af835df..826a612c6c 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/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": { - "value": true - }, + "material_print_temp_wait": { "value": true }, "speed_slowdown_layers": { "value": 2 } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 36a42ba695..27957af727 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -50,8 +50,8 @@ "supported_actions": [ "DiscoverUM3Action" ], "supports_material_export": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true, + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index a7e347ccba..46d46d33eb 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -54,8 +54,8 @@ "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true, + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -2 }, "overrides": diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index 6fc57cfb37..14d9b21168 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -40,8 +40,8 @@ "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, - "variants_name": "Print Core", - "variants_name_has_translation": true, + "variants_name": "Print Core", + "variants_name_has_translation": true, "weight": -2 }, "overrides": diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 65c003ea3b..2f96b52397 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -72,7 +72,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_sketch_large.def.json b/resources/definitions/ultimaker_sketch_large.def.json index d962649d41..49ae05a614 100644 --- a/resources/definitions/ultimaker_sketch_large.def.json +++ b/resources/definitions/ultimaker_sketch_large.def.json @@ -20,7 +20,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index ae9b08932d..cde655e70f 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -16,7 +16,7 @@ "chromatik_", "3D-Fuel_", "bestfilament_", - "eazao_", + "eazao_", "emotiontech_", "eryone_", "eSUN_", @@ -58,7 +58,7 @@ ], "has_machine_quality": true, "has_materials": true, - "has_textured_buildplate": true, + "has_textured_buildplate": true, "has_variants": true, "machine_extruder_trains": { "0": "ultimaker_sketch_sprint_extruder" }, "platform_offset": [ @@ -74,7 +74,7 @@ "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Extruder", - "variants_name_has_translation": true, + "variants_name_has_translation": true, "weight": -1 }, "overrides": diff --git a/resources/definitions/uni_200.def.json b/resources/definitions/uni_200.def.json index f68cef31c1..c58264e1ee 100644 --- a/resources/definitions/uni_200.def.json +++ b/resources/definitions/uni_200.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_200_platform.stl", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "uni.png", "quality_definition": "uni_base" }, diff --git a/resources/definitions/uni_250.def.json b/resources/definitions/uni_250.def.json index 17ff3b6c0e..ae2aad9714 100644 --- a/resources/definitions/uni_250.def.json +++ b/resources/definitions/uni_250.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_250_platform.stl", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "uni.png", "quality_definition": "uni_base" }, diff --git a/resources/definitions/uni_300.def.json b/resources/definitions/uni_300.def.json index de9f95618e..6d801b68f8 100644 --- a/resources/definitions/uni_300.def.json +++ b/resources/definitions/uni_300.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_300_platform.stl", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "uni.png", "quality_definition": "uni_base" }, diff --git a/resources/definitions/uni_mini.def.json b/resources/definitions/uni_mini.def.json index 553d421207..be327eef4a 100644 --- a/resources/definitions/uni_mini.def.json +++ b/resources/definitions/uni_mini.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "Nail` Gimadeev (C)", "platform": "uni_mini_platform.stl", - "has_textured_buildplate": true, + "has_textured_buildplate": true, "platform_texture": "uni.png", "quality_definition": "uni_base" },