diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 3d59817996..d14701d278 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -65,6 +65,8 @@ jobs: name: Create tags runs-on: ubuntu-latest needs: [parse-version, find-rc-tag] + outputs: + main_commit: ${{ steps.export-main-commit.outputs.main_commit }} strategy: matrix: repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] @@ -76,11 +78,23 @@ jobs: ref: ${{ needs.parse-version.outputs.branch_name }} token: ${{ secrets.CURA_AUTORELEASE_PAT }} - - name: Create tag + - name: Create RC tag run: | git tag ${{ needs.find-rc-tag.outputs.tag_name }} git push origin tag ${{ needs.find-rc-tag.outputs.tag_name }} + - name: Create or update release tag + run: | + git tag -f ${{ inputs.cura_version }} + git push -f origin tag ${{ inputs.cura_version }} + + - name: Export Cura tagged commit + id: export-main-commit + if: ${{ matrix.repository == 'Cura' }} + run: | + echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT" + + create-dependencies-packages: name: Create conan packages for dependencies uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main @@ -131,7 +145,7 @@ jobs: create-release-draft: name: Create the release draft runs-on: ubuntu-latest - needs: [create-installers, parse-version] + needs: [create-installers, parse-version, create-tags] steps: - name: Checkout Cura repo uses: actions/checkout@v4 @@ -141,16 +155,10 @@ jobs: - name: Extract changelog run: python ./scripts/extract_changelog.py --version ${{ needs.parse-version.outputs.version_major }}.${{ needs.parse-version.outputs.version_minor }}.${{ needs.parse-version.outputs.version_patch }} --changelog ./resources/texts/change_log.txt > formatted_changelog.txt - - name: Get commit id for release - id: get-commit-id - uses: iawia002/get-tag-or-commit-id@v1.0.1 - with: - length: 40 - - name: Create release uses: notpeelz/action-gh-create-release@v5.0.1 with: - target: ${{ steps.get-commit-id.outputs.id }} + target: ${{ needs.create-tags.outputs.main_commit }} tag: ${{ inputs.cura_version }} strategy: replace title: UltiMaker Cura ${{ inputs.cura_version }} diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json new file mode 100644 index 0000000000..70ab78a5a6 --- /dev/null +++ b/resources/definitions/eazao_m500.def.json @@ -0,0 +1,74 @@ +{ + "version": 2, + "name": "Eazao M500", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": false, + "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, + "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "'none'" }, + "bottom_layers": { "value": 2 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 2 }, + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 520 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao M500" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 320 }, + "magic_spiralize": { "value": true }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "speed_print": { "value": 20.0 }, + "speed_travel": { "value": 20.0 }, + "speed_wall": { "value": 20.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 20.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_pattern": { "value": "concentric" }, + "top_bottom_thickness": { "value": 3 }, + "wall_thickness": { "value": 5.0 } + } +} \ No newline at end of file diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json new file mode 100644 index 0000000000..35a946e25e --- /dev/null +++ b/resources/definitions/eazao_m600.def.json @@ -0,0 +1,74 @@ +{ + "version": 2, + "name": "Eazao M600", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": false, + "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, + "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "'none'" }, + "bottom_layers": { "value": 2 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 2 }, + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 420 }, + "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y400 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 620 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao M600" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 420 }, + "magic_spiralize": { "value": true }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "speed_print": { "value": 20.0 }, + "speed_travel": { "value": 20.0 }, + "speed_wall": { "value": 20.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 20.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_pattern": { "value": "concentric" }, + "top_bottom_thickness": { "value": 3 }, + "wall_thickness": { "value": 5.0 } + } +} \ No newline at end of file diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json new file mode 100644 index 0000000000..8459b3625d --- /dev/null +++ b/resources/definitions/eazao_m700.def.json @@ -0,0 +1,74 @@ +{ + "version": 2, + "name": "Eazao M700", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": false, + "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, + "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "none" }, + "bottom_layers": { "value": 2 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 2 }, + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 520 }, + "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y500 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 720 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao M700" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 520 }, + "magic_spiralize": { "value": true }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "speed_print": { "value": 20.0 }, + "speed_travel": { "value": 20.0 }, + "speed_wall": { "value": 20.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 20.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_pattern": { "value": "concentric" }, + "top_bottom_thickness": { "value": 3 }, + "wall_thickness": { "value": 5.0 } + } +} \ No newline at end of file diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json new file mode 100644 index 0000000000..0ff84ab429 --- /dev/null +++ b/resources/definitions/eazao_potter.def.json @@ -0,0 +1,74 @@ +{ + "version": 2, + "name": "Eazao Potter", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": false, + "machine_extruder_trains": { "0": "eazao_potter_extruder_0" }, + "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "'none'" }, + "bottom_layers": { "value": 3 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 3 }, + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 167 }, + "machine_end_gcode": { "default_value": "G92 Z0 E0\nG1 F1500 Z10 E-2\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 280 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao Potter" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 25mm\nG92 E0 ;extruder reset\nG1 F1500 E2\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 167 }, + "magic_spiralize": { "value": true }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "speed_print": { "value": 25.0 }, + "speed_travel": { "value": 25.0 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 25.0 }, + "speed_wall_x": { "value": 25.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_pattern": { "value": "concentric" }, + "top_bottom_thickness": { "value": 3 }, + "wall_thickness": { "value": 3.0 } + } +} \ No newline at end of file diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index f849e25eb5..df6f4faa18 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -9,9 +9,8 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": true, + "has_materials": false, "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, - "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, "overrides": @@ -20,11 +19,10 @@ "acceleration_print": { "value": 300 }, "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "none" }, - "bottom_layers": { "value": 2 }, + "bottom_layers": { "value": 3 }, "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, - "initial_bottom_layers": { "value": 2 }, - "jerk_enabled": { "value": false }, + "initial_bottom_layers": { "value": 3 }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, @@ -34,7 +32,7 @@ "machine_acceleration": { "value": 300 }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 150 }, - "machine_end_gcode": { "default_value": "G92 E10\nG1 E-10 F300\nG28 X0 Y0 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_end_gcode": { "default_value": "G92 Z0 E0\nG1 F1500 E-2\nG1 F1500 Z10\nG28 X0;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_heated_bed": { "default_value": false }, "machine_height": { "default_value": 240 }, @@ -49,9 +47,10 @@ "machine_max_jerk_e": { "value": 5 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_name": { "default_value": "EAZAO Zero" }, - "machine_start_gcode": { "default_value": "G21 \nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home \nG1 Z15.0 F1500 ;move the platform down 15mm\nG92 E0 \nG1 F300 E10\nG92 E0\nM302\nM163 S0 P0.9; Set Mix Factor\nM163 S1 P0.1; Set Mix Factor\nM164 S0\n" }, + "machine_name": { "default_value": "Eazao Zero" }, + "machine_start_gcode": { "default_value": "G21 \nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home \nG1 Z15.0 F1500 ;move the platform down 15mm\nG92 E0 \nG1 F1500 E2\nG92 E0\nM302\nM163 S0 P0.8; Set Mix Factor\nM163 S1 P0.2; Set Mix Factor\nM164 S0\n" }, "machine_width": { "default_value": 150 }, + "magic_spiralize": { "value": true }, "material_final_print_temperature": { "value": "0" }, "material_initial_print_temperature": { "value": "0" }, "material_print_temperature": { "value": "0" }, @@ -64,18 +63,10 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "retraction_hop_enabled": { "value": false }, - "retraction_speed": { "value": 25 }, - "speed_print": { "value": 20.0 }, - "speed_travel": { "value": 20.0 }, - "speed_wall": { "value": 20.0 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 20.0 }, + "speed_print": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, - "top_bottom_thickness": { "value": 0 }, - "travel_avoid_other_parts": { "value": true }, - "travel_avoid_supports": { "value": false }, - "travel_retract_before_outer_wall": { "value": false }, + "top_bottom_pattern": { "value": "concentric" }, + "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 3.0 } } } \ No newline at end of file diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 79e40d56c4..571d501212 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2336,7 +2336,7 @@ "label": "Skin Edge Support Thickness", "description": "The thickness of the extra infill that supports skin edges.", "unit": "mm", - "default_value": 0.8, + "default_value": 0, "minimum_value": "0", "maximum_value": "machine_height", "maximum_value_warning": "resolveOrValue('infill_sparse_thickness') * 10", @@ -2351,7 +2351,7 @@ { "label": "Skin Edge Support Layers", "description": "The number of infill layers that supports skin edges.", - "default_value": 4, + "default_value": 0, "minimum_value": "0", "maximum_value_warning": "10", "type": "int", @@ -2363,6 +2363,21 @@ } } }, + "extra_infill_lines_to_support_skins": + { + "label": "Extra Infill Lines To Support Skins", + "description": "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin.", + "type": "enum", + "options": + { + "walls_and_lines": "Walls and Lines", + "walls": "Walls Only", + "none": "None" + }, + "default_value": "walls_and_lines", + "value": "'none' if infill_sparse_density > 50 else 'walls' if skin_edge_support_thickness > 0 else 'walls_and_lines'", + "enabled": "infill_sparse_density > 0 and infill_pattern not in ('lightning', 'concentric', 'cross','cross_3d') and wall_line_count > 0 and top_layers > 0" + }, "lightning_infill_support_angle": { "label": "Lightning Infill Support Angle", diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 48353244be..21e905fdf8 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -111,7 +111,6 @@ "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_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/extruders/eazao_m500_extruder_0.def.json b/resources/extruders/eazao_m500_extruder_0.def.json new file mode 100644 index 0000000000..6f95c06cc9 --- /dev/null +++ b/resources/extruders/eazao_m500_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_m500", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 2.3 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/eazao_m600_extruder_0.def.json b/resources/extruders/eazao_m600_extruder_0.def.json new file mode 100644 index 0000000000..bcbad3ab0f --- /dev/null +++ b/resources/extruders/eazao_m600_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_m600", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 2.3 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/eazao_m700_extruder_0.def.json b/resources/extruders/eazao_m700_extruder_0.def.json new file mode 100644 index 0000000000..fada355172 --- /dev/null +++ b/resources/extruders/eazao_m700_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_m700", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 2.3 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/eazao_potter_extruder_0.def.json b/resources/extruders/eazao_potter_extruder_0.def.json new file mode 100644 index 0000000000..e2c1451896 --- /dev/null +++ b/resources/extruders/eazao_potter_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_potter", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 1.6 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/eazao_zero_extruder_0.def.json b/resources/extruders/eazao_zero_extruder_0.def.json index 5d34008337..f4b958fba7 100644 --- a/resources/extruders/eazao_zero_extruder_0.def.json +++ b/resources/extruders/eazao_zero_extruder_0.def.json @@ -10,7 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 1.5 }, + "machine_nozzle_size": { "default_value": 1.6 }, "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index f0ba478a53..9950957081 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -110,6 +110,7 @@ min_skin_width_for_expansion infill_randomize_start_location skin_edge_support_thickness skin_edge_support_layers +extra_infill_lines_to_support_skins [material] default_material_print_temperature