diff --git a/.github/workflows/create_pr_comment.yml b/.github/workflows/create_pr_comment.yml deleted file mode 100644 index ca2d03b47..000000000 --- a/.github/workflows/create_pr_comment.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: - workflow_run: - workflows: ["VoronUsers PR CI"] - types: - - completed - -jobs: - create_pr_comment: - permissions: - pull-requests: write - name: Create PR comment and assign labels - if: ${{ github.event.workflow_run.event == 'pull_request' }} - uses: VoronDesign/.github/.github/workflows/pr-comment-labels.yml@main diff --git a/.github/workflows/pull_request_ci.yml b/.github/workflows/pull_request_ci.yml index 102bdcea2..5a08ed030 100644 --- a/.github/workflows/pull_request_ci.yml +++ b/.github/workflows/pull_request_ci.yml @@ -1,98 +1,13 @@ -name: VoronUsers PR CI +name: pull_request_ci run-name: "#${{github.event.number}} - ${{github.event.pull_request.title}}" on: - pull_request: - types: [opened, reopened, synchronize] + pull_request: + types: [opened, reopened, synchronize] concurrency: - group: ${{ github.ref }} - cancel-in-progress: true + group: ${{ github.ref }} + cancel-in-progress: true permissions: - pull-requests: write + pull-requests: write jobs: - check_whitespace: - uses: VoronDesign/.github/.github/workflows/check-whitespace-cache.yml@main - with: - branch: ${{ github.ref }} - cache-key: file-cache-${{github.sha}} - cache-directory: pr-files - parent-job-name: check_whitespace - setup_python: - needs: [check_whitespace] - if: ${{ needs.check_whitespace.outputs.stl == 'true' }} - uses: VoronDesign/.github/.github/workflows/prepare-environment.yml@main - with: - apt-packages: "admesh, libadmesh-dev" - pip-packages: "admesh imagekitio git+https://github.com/ChristophSchranz/Tweaker-3.git" - python-cache-key: voronusers-python-cache - check_stl_corruption: - needs: [setup_python] - if: ${{ needs.check_whitespace.outputs.stl == 'true' }} - uses: VoronDesign/.github/.github/workflows/check-stl-corruption.yml@main - with: - cache-key: file-cache-${{github.sha}} - cache-directory: pr-files - python-cache-key: voronusers-python-cache - parent-job-name: check_stl_corruption - check_stl_rotation: - needs: [setup_python] - if: ${{ needs.check_whitespace.outputs.stl == 'true' }} - uses: VoronDesign/.github/.github/workflows/check-stl-rotation.yml@main - with: - imagekit-url-endpoint: https://ik.imagekit.io/vorondesign - cache-key: file-cache-${{github.sha}} - cache-directory: pr-files - python-cache-key: voronusers-python-cache - parent-job-name: check_stl_rotation - check_metadata: - needs: [check_whitespace] - if: ${{ needs.check_whitespace.outputs.yaml == 'true' }} - uses: VoronDesign/.github/.github/workflows/check-metadata-files.yml@main - with: - cache-key: file-cache-${{github.sha}} - cache-directory: pr-files - parent-job-name: check_metadata - preview_readme: - needs: [check_metadata] - uses: VoronDesign/.github/.github/workflows/preview-readme.yml@main - with: - subdirectory: printer_mods - cache-key: file-cache-${{github.sha}} - cache-directory: pr-files - parent-job-name: preview_readme - prepare_pr_comment: - # Dispatching allows us to run in the context of our repo, with sufficient credentials to do PR comments/set labels. We pass the - # information that the dispatched workflow can't deduce on its own via the client payload parameter - needs: [check_whitespace, check_stl_corruption, check_stl_rotation, check_metadata, preview_readme] - if: ${{ always() }} - runs-on: ubuntu-latest - steps: - - name: Save PR number - run: | - mkdir -p ${{ runner.temp }}/pr - echo -n "Ready for review" > ${{ runner.temp }}/pr/ready_label - echo -n ${{ github.event.number }} > ${{ runner.temp }}/pr/pr_number - echo -n ${{ github.run_id }} > ${{ runner.temp }}/pr/action_run_id - mkdir -p ${{ runner.temp }}/pr/check_stl_corruption - echo -n ${{ needs.check_stl_corruption.outputs.extended-outcome }} > ${{ runner.temp }}/pr/check_stl_corruption/result - echo -n ${{ needs.check_stl_corruption.outputs.numeric-job-id}} > ${{ runner.temp }}/pr/check_stl_corruption/job_id - echo -n "CR: STL Corruption" > ${{ runner.temp }}/pr/check_stl_corruption/error_label - mkdir -p ${{ runner.temp }}/pr/check_stl_rotation - echo -n ${{ needs.check_stl_rotation.outputs.extended-outcome }} > ${{ runner.temp }}/pr/check_stl_rotation/result - echo -n ${{ needs.check_stl_rotation.outputs.numeric-job-id}} > ${{ runner.temp }}/pr/check_stl_rotation/job_id - echo -n "CR: STL Rotation" > ${{ runner.temp }}/pr/check_stl_rotation/error_label - mkdir -p ${{ runner.temp }}/pr/check_whitespace - echo -n ${{ needs.check_whitespace.outputs.extended-outcome }} > ${{ runner.temp }}/pr/check_whitespace/result - echo -n ${{ needs.check_whitespace.outputs.numeric-job-id}} > ${{ runner.temp }}/pr/check_whitespace/job_id - echo -n "CR: Files & Folders" > ${{ runner.temp }}/pr/check_whitespace/error_label - mkdir -p ${{ runner.temp }}/pr/check_metadata - echo -n ${{ needs.check_metadata.outputs.extended-outcome }} > ${{ runner.temp }}/pr/check_metadata/result - echo -n ${{ needs.check_metadata.outputs.numeric-job-id}} > ${{ runner.temp }}/pr/check_metadata/job_id - echo -n "CR: Metadata Files" > ${{ runner.temp }}/pr/check_metadata/error_label - mkdir -p ${{ runner.temp }}/pr/preview_readme - echo -n ${{ needs.preview_readme.outputs.extended-outcome }} > ${{ runner.temp }}/pr/preview_readme/result - echo -n ${{ needs.preview_readme.outputs.numeric-job-id}} > ${{ runner.temp }}/pr/preview_readme/job_id - echo -n "CR: Readme Preview" > ${{ runner.temp }}/pr/preview_readme/error_label - - uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05 - with: - name: pr - path: ${{ runner.temp }}/pr + voronusers_ci_pr_check: + uses: VoronDesign/.github/.github/workflows/voronusers-ci-pr-check.yml@main \ No newline at end of file diff --git a/.github/workflows/pull_request_post_process_ci.yml b/.github/workflows/pull_request_post_process_ci.yml new file mode 100644 index 000000000..0ac0e3f1e --- /dev/null +++ b/.github/workflows/pull_request_post_process_ci.yml @@ -0,0 +1,11 @@ +on: + workflow_run: + workflows: ["pull_request_ci"] + types: + - completed + +jobs: + post_process_pr_ci: + if: ${{ github.event.workflow_run.event == 'pull_request' }} + uses: VoronDesign/.github/.github/workflows/voronusers-ci-pr-postprocess.yml@main + \ No newline at end of file diff --git a/.github/workflows/push_main_ci.yml b/.github/workflows/push_main_ci.yml index ef1261746..645519c12 100644 --- a/.github/workflows/push_main_ci.yml +++ b/.github/workflows/push_main_ci.yml @@ -1,23 +1,9 @@ name: VoronUsers Push Main CI on: - push: - branches: - - 'main' + push: + branches: + - 'main' jobs: - setup_python: - name: Rebuild repo caches - uses: VoronDesign/.github/.github/workflows/prepare-environment.yml@main - with: - apt-packages: "admesh, libadmesh-dev" - pip-packages: "admesh imagekitio git+https://github.com/ChristophSchranz/Tweaker-3.git" - python-cache-key: voronusers-python-cache - preview_readme: - name: Generate README - uses: VoronDesign/.github/.github/workflows/generate-readme.yml@main - with: - subdirectory: printer_mods - commit_msg: "Generate VoronUsers printer_mods README.md [skip ci]" - commit_user: Voron-GitHub-Bot - commit_email: github@vorondesign.com - secrets: - VORON_BOT_GITHUB_PAT: ${{ secrets.VORON_BOT_GITHUB_PAT }} + voron_ci_push_main: + name: VoronCI push main + uses: VoronDesign/.github/.github/workflows/voronusers-ci-push-main.yml@main diff --git a/.github/workflows/upload_pr_images.yml b/.github/workflows/upload_pr_images.yml deleted file mode 100644 index 60fe64066..000000000 --- a/.github/workflows/upload_pr_images.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - workflow_run: - workflows: ["VoronUsers PR CI"] - types: - - completed - -jobs: - upload_imagekit: - if: ${{ github.event.workflow_run.event == 'pull_request' }} - uses: VoronDesign/.github/.github/workflows/upload-artifact-imagekit.yml@main - with: - artifact_name: pr_rotated_stls - images_subfolder: img - imagekit-url-endpoint: https://ik.imagekit.io/vorondesign - secrets: - IMAGEKIT_PRIVATE_KEY: ${{ secrets.IMAGEKIT_PRIVATE_KEY }} - IMAGEKIT_PUBLIC_KEY: ${{ secrets.IMAGEKIT_PUBLIC_KEY }} diff --git a/printer_mods/Akio/cable_routing_z_belt_cover/.metadata.yml b/printer_mods/Akio/cable_routing_z_belt_cover/.metadata.yml index 773df2cea..ffbc4ba81 100644 --- a/printer_mods/Akio/cable_routing_z_belt_cover/.metadata.yml +++ b/printer_mods/Akio/cable_routing_z_belt_cover/.metadata.yml @@ -3,16 +3,16 @@ cad: - cad/cable_routing_z_belt_cover_a_mod_rail_notch_v2.4.step - cad/cable_routing_z_belt_cover_a_mod_v2.2.step - cad/cable_routing_z_belt_cover_a_mod_v2.4.step -- cad\cable_routing_z_belt_cover_b_mod_rail_notch_v2.2.step -- cad\cable_routing_z_belt_cover_b_mod_rail_notch_v2.4.step -- cad\cable_routing_z_belt_cover_b_mod_v2.2.step -- cad\cable_routing_z_belt_cover_b_mod_v2.4.step +- cad/cable_routing_z_belt_cover_b_mod_rail_notch_v2.2.step +- cad/cable_routing_z_belt_cover_b_mod_rail_notch_v2.4.step +- cad/cable_routing_z_belt_cover_b_mod_v2.2.step +- cad/cable_routing_z_belt_cover_b_mod_v2.4.step description: Z belt covers that allow hidden cable routing. images: -- img/cable_routing_z_belt_cover_mod_v2.2_img_2.png +- img/cable_routing_z_belt_cover_mod_v2.2_img_2.jpg - img/cable_routing_z_belt_cover_mod_v2.2_img_0.png - img/cable_routing_z_belt_cover_mod_v2.2_img_1.png -- img/cable_routing_z_belt_cover_mod_v2.2_img_3.png +- img/cable_routing_z_belt_cover_mod_v2.2_img_3.jpg - img/cable_routing_z_belt_cover_mod_v2.4_img_0.png - img/cable_routing_z_belt_cover_mod_v2.4_img_1.png - img/cable_routing_z_belt_cover_mod_rail_notch_v2.4_img_2.png diff --git a/printer_mods/Ellis/Badge_Retractor_Mount/.metadata.yml b/printer_mods/Ellis/Badge_Retractor_Mount/.metadata.yml index 67afc9bac..6df995741 100644 --- a/printer_mods/Ellis/Badge_Retractor_Mount/.metadata.yml +++ b/printer_mods/Ellis/Badge_Retractor_Mount/.metadata.yml @@ -1,6 +1,6 @@ cad: -- CAD/Retractor Mount Straight.f3d -- CAD/Retractor Mount Slanted.f3d +- CAD/Retractor_Mount_Straight.f3d +- CAD/Retractor_Mount_Slanted.f3d description: Extrusion mount for badge retractor to keep bowden tube out of the way. images: - Images/Image.jpg diff --git a/printer_mods/FreeformFez/FilteredPower/.metadata.yml b/printer_mods/FreeformFez/FilteredPower/.metadata.yml index be613eb37..022bb0253 100644 --- a/printer_mods/FreeformFez/FilteredPower/.metadata.yml +++ b/printer_mods/FreeformFez/FilteredPower/.metadata.yml @@ -1,5 +1,5 @@ cad: -- Parametric Filtered Power v1.8.f3d +- Parametric_Filtered_Power_v1.8.f3d description: V1.6 Filtered Inlet and Rocker Switch for V1.8 images: - pictures/Front.png diff --git a/printer_mods/Gizzle/ender-3_pro_switchwire/.metadata.yml b/printer_mods/Gizzle/ender-3_pro_switchwire/.metadata.yml index 57e2b1062..f6657f143 100644 --- a/printer_mods/Gizzle/ender-3_pro_switchwire/.metadata.yml +++ b/printer_mods/Gizzle/ender-3_pro_switchwire/.metadata.yml @@ -1,5 +1,5 @@ cad: -- CAD/Ender3SW v2.f3d +- CAD/Ender3SW_v2.f3d description: Mod for the Ender 3 and Ender 3 Pro, which adapts the kinematics and most other parts of the Voron Switchwire. images: diff --git a/printer_mods/JNP/Front-Door/.metadata.yml b/printer_mods/JNP/Front-Door/.metadata.yml index a4eef8bb8..6d5cf81af 100644 --- a/printer_mods/JNP/Front-Door/.metadata.yml +++ b/printer_mods/JNP/Front-Door/.metadata.yml @@ -1,6 +1,6 @@ cad: - CAD/Handle_Mini_Front.step -- CAD/Door Frame.step +- CAD/Door_Frame.step - CAD/Door_Latch_x2.step description: Door in a frame images: diff --git a/printer_mods/JNP/HEPA-Filter/.metadata.yml b/printer_mods/JNP/HEPA-Filter/.metadata.yml index c54160081..f8ef8bc89 100644 --- a/printer_mods/JNP/HEPA-Filter/.metadata.yml +++ b/printer_mods/JNP/HEPA-Filter/.metadata.yml @@ -1,6 +1,6 @@ cad: -- CAD/Filter Cage.step -- CAD/Fan Mounting.step +- CAD/Filter_Cage.step +- CAD/Fan_Mounting.step - CAD/HEPA_Filter.step description: "Filter case with fan\xB4s" images: diff --git a/printer_mods/JNP/Side-Panels/.metadata.yml b/printer_mods/JNP/Side-Panels/.metadata.yml index bea3ef9b1..9ea743a9a 100644 --- a/printer_mods/JNP/Side-Panels/.metadata.yml +++ b/printer_mods/JNP/Side-Panels/.metadata.yml @@ -1,6 +1,6 @@ cad: -- CAD/Panel right.step -- CAD/Panel left.step +- CAD/Panel_right.step +- CAD/Panel_left.step description: Panels with intergrated hinge images: - Images/1.jpg diff --git a/printer_mods/JosAr/Klicky-Probe/.metadata.yml b/printer_mods/JosAr/Klicky-Probe/.metadata.yml index 239a037b5..70afcc639 100644 --- a/printer_mods/JosAr/Klicky-Probe/.metadata.yml +++ b/printer_mods/JosAr/Klicky-Probe/.metadata.yml @@ -53,7 +53,7 @@ images: - Printers/v1.8_v2.4_Legacy_Trident/Photos/probe_v1_underside_marked_magnets.jpg - Printers/v1.8_v2.4_Legacy_Trident/Photos/AB_mount_press_Helper_inuseBack.jpg - Printers/v1.8_v2.4_Legacy_Trident/Photos/klicky_v1.8_v2.4_Legacy_Trident.jpg -- Printers/v1.8_v2.4_Legacy_Trident/Photos/Klicky_Probe installed.png +- Printers/v1.8_v2.4_Legacy_Trident/Photos/Klicky_Probe_installed.png - Printers/v1.8_v2.4_Legacy_Trident/Photos/Probe_MStoArrow_alignment.jpg - Printers/v1.8_v2.4_Legacy_Trident/Photos/AB_mount_press_Helper_inuseTop.jpg - Printers/v1.8_v2.4_Legacy_Trident/Photos/probe_dock_complete.jpg diff --git a/printer_mods/Kruppes/Tension_Meter/.metadata.yml b/printer_mods/Kruppes/Tension_Meter/.metadata.yml index af3fd6559..af72aa102 100644 --- a/printer_mods/Kruppes/Tension_Meter/.metadata.yml +++ b/printer_mods/Kruppes/Tension_Meter/.metadata.yml @@ -1,5 +1,5 @@ cad: -- Tension Meter.f3d +- Tension_Meter.f3d description: Print in place tension meter to easily tighten multiple belts to the same tension images: diff --git a/printer_mods/LoganFraser/ComboInlet/.metadata.yml b/printer_mods/LoganFraser/ComboInlet/.metadata.yml index dcd971a55..09a242182 100644 --- a/printer_mods/LoganFraser/ComboInlet/.metadata.yml +++ b/printer_mods/LoganFraser/ComboInlet/.metadata.yml @@ -1,6 +1,6 @@ cad: -- CAD/Trident_2.4_ComboInletSkirt v8.f3d -- CAD/Trident_2.4_ComboInletSkirt v8.step +- CAD/Trident_2.4_ComboInletSkirt_v8.f3d +- CAD/Trident_2.4_ComboInletSkirt_v8.step description: Skirt pieces for Trident, 2.4 and 2.4r2 for combo inlets in 2 sizes. images: - ComboInlets.png diff --git a/printer_mods/Long/Mantis_Dual_5015/.metadata.yml b/printer_mods/Long/Mantis_Dual_5015/.metadata.yml index 87d1b1677..a8edea0ed 100644 --- a/printer_mods/Long/Mantis_Dual_5015/.metadata.yml +++ b/printer_mods/Long/Mantis_Dual_5015/.metadata.yml @@ -1,7 +1,7 @@ cad: - CAD/Mantis_MGN12_CrazyVolcano_v1.0.step - CAD/Mantis_MGN12_Dragon_v1.041_and_v1.043e.step -- CAD/Mantis_MGN12_Rapido_and Rapido_UHF.step +- CAD/Mantis_MGN12_Rapido_and_Rapido_UHF.step - CAD/Mantis_MGN9_v1.0a.step description: MGN12 Dual 5015 Toolhead for 2.4 & 1.8 images: diff --git a/printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/.metadata.yml b/printer_mods/Nomsplease/V0_duet_wifi_mount/.metadata.yml similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/.metadata.yml rename to printer_mods/Nomsplease/V0_duet_wifi_mount/.metadata.yml diff --git a/printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/Images/back_compartment.jpg b/printer_mods/Nomsplease/V0_duet_wifi_mount/Images/back_compartment.jpg similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/Images/back_compartment.jpg rename to printer_mods/Nomsplease/V0_duet_wifi_mount/Images/back_compartment.jpg diff --git a/printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/Images/closed_back.jpg b/printer_mods/Nomsplease/V0_duet_wifi_mount/Images/closed_back.jpg similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/Images/closed_back.jpg rename to printer_mods/Nomsplease/V0_duet_wifi_mount/Images/closed_back.jpg diff --git a/printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/README.md b/printer_mods/Nomsplease/V0_duet_wifi_mount/README.md similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/README.md rename to printer_mods/Nomsplease/V0_duet_wifi_mount/README.md diff --git a/printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/duet_wifi_mount.step b/printer_mods/Nomsplease/V0_duet_wifi_mount/duet_wifi_mount.step similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/duet_wifi_mount.step rename to printer_mods/Nomsplease/V0_duet_wifi_mount/duet_wifi_mount.step diff --git a/printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/duet_wifi_mount.stl b/printer_mods/Nomsplease/V0_duet_wifi_mount/duet_wifi_mount.stl similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/duet_wifi_mount/duet_wifi_mount.stl rename to printer_mods/Nomsplease/V0_duet_wifi_mount/duet_wifi_mount.stl diff --git a/printer_mods/Nomsplease/V0_Mods/led_mounts/.metadata.yml b/printer_mods/Nomsplease/V0_led_mounts/.metadata.yml similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/led_mounts/.metadata.yml rename to printer_mods/Nomsplease/V0_led_mounts/.metadata.yml diff --git a/printer_mods/Nomsplease/V0_Mods/led_mounts/10mm_strip_mount_full.step b/printer_mods/Nomsplease/V0_led_mounts/10mm_strip_mount_full.step similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/led_mounts/10mm_strip_mount_full.step rename to printer_mods/Nomsplease/V0_led_mounts/10mm_strip_mount_full.step diff --git a/printer_mods/Nomsplease/V0_Mods/led_mounts/10mm_strip_mount_full.stl b/printer_mods/Nomsplease/V0_led_mounts/10mm_strip_mount_full.stl similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/led_mounts/10mm_strip_mount_full.stl rename to printer_mods/Nomsplease/V0_led_mounts/10mm_strip_mount_full.stl diff --git a/printer_mods/Nomsplease/V0_Mods/led_mounts/10mm_strip_mount_full_with_channel.step b/printer_mods/Nomsplease/V0_led_mounts/10mm_strip_mount_full_with_channel.step similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/led_mounts/10mm_strip_mount_full_with_channel.step rename to printer_mods/Nomsplease/V0_led_mounts/10mm_strip_mount_full_with_channel.step diff --git a/printer_mods/Nomsplease/V0_Mods/led_mounts/10mm_strip_mount_full_with_channel.stl b/printer_mods/Nomsplease/V0_led_mounts/10mm_strip_mount_full_with_channel.stl similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/led_mounts/10mm_strip_mount_full_with_channel.stl rename to printer_mods/Nomsplease/V0_led_mounts/10mm_strip_mount_full_with_channel.stl diff --git a/printer_mods/Nomsplease/V0_Mods/led_mounts/12mm_strip_mini_mount.step b/printer_mods/Nomsplease/V0_led_mounts/12mm_strip_mini_mount.step similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/led_mounts/12mm_strip_mini_mount.step rename to printer_mods/Nomsplease/V0_led_mounts/12mm_strip_mini_mount.step diff --git a/printer_mods/Nomsplease/V0_Mods/led_mounts/12mm_strip_mini_mount.stl b/printer_mods/Nomsplease/V0_led_mounts/12mm_strip_mini_mount.stl similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/led_mounts/12mm_strip_mini_mount.stl rename to printer_mods/Nomsplease/V0_led_mounts/12mm_strip_mini_mount.stl diff --git a/printer_mods/Nomsplease/V0_Mods/led_mounts/Images/lighting.jpg b/printer_mods/Nomsplease/V0_led_mounts/Images/lighting.jpg similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/led_mounts/Images/lighting.jpg rename to printer_mods/Nomsplease/V0_led_mounts/Images/lighting.jpg diff --git a/printer_mods/Nomsplease/V0_Mods/led_mounts/README.md b/printer_mods/Nomsplease/V0_led_mounts/README.md similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/led_mounts/README.md rename to printer_mods/Nomsplease/V0_led_mounts/README.md diff --git a/printer_mods/Nomsplease/V0_Mods/panel_mounts/.metadata.yml b/printer_mods/Nomsplease/V0_panel_mounts/.metadata.yml similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/panel_mounts/.metadata.yml rename to printer_mods/Nomsplease/V0_panel_mounts/.metadata.yml diff --git a/printer_mods/Nomsplease/V0_Mods/panel_mounts/README.md b/printer_mods/Nomsplease/V0_panel_mounts/README.md similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/panel_mounts/README.md rename to printer_mods/Nomsplease/V0_panel_mounts/README.md diff --git a/printer_mods/Nomsplease/V0_Mods/panel_mounts/rear_bottom_left_bracket_with_stop.step b/printer_mods/Nomsplease/V0_panel_mounts/rear_bottom_left_bracket_with_stop.step similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/panel_mounts/rear_bottom_left_bracket_with_stop.step rename to printer_mods/Nomsplease/V0_panel_mounts/rear_bottom_left_bracket_with_stop.step diff --git a/printer_mods/Nomsplease/V0_Mods/panel_mounts/rear_bottom_left_bracket_with_stop.stl b/printer_mods/Nomsplease/V0_panel_mounts/rear_bottom_left_bracket_with_stop.stl similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/panel_mounts/rear_bottom_left_bracket_with_stop.stl rename to printer_mods/Nomsplease/V0_panel_mounts/rear_bottom_left_bracket_with_stop.stl diff --git a/printer_mods/Nomsplease/V0_Mods/panel_mounts/rear_bottom_right_bracket_with_stop.step b/printer_mods/Nomsplease/V0_panel_mounts/rear_bottom_right_bracket_with_stop.step similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/panel_mounts/rear_bottom_right_bracket_with_stop.step rename to printer_mods/Nomsplease/V0_panel_mounts/rear_bottom_right_bracket_with_stop.step diff --git a/printer_mods/Nomsplease/V0_Mods/panel_mounts/rear_bottom_right_bracket_with_stop.stl b/printer_mods/Nomsplease/V0_panel_mounts/rear_bottom_right_bracket_with_stop.stl similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/panel_mounts/rear_bottom_right_bracket_with_stop.stl rename to printer_mods/Nomsplease/V0_panel_mounts/rear_bottom_right_bracket_with_stop.stl diff --git a/printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/.metadata.yml b/printer_mods/Nomsplease/V0_pi_zero_camera_mount/.metadata.yml similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/.metadata.yml rename to printer_mods/Nomsplease/V0_pi_zero_camera_mount/.metadata.yml diff --git a/printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/README.md b/printer_mods/Nomsplease/V0_pi_zero_camera_mount/README.md similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/README.md rename to printer_mods/Nomsplease/V0_pi_zero_camera_mount/README.md diff --git a/printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/camera_mount.step b/printer_mods/Nomsplease/V0_pi_zero_camera_mount/camera_mount.step similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/camera_mount.step rename to printer_mods/Nomsplease/V0_pi_zero_camera_mount/camera_mount.step diff --git a/printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/camera_mount.stl b/printer_mods/Nomsplease/V0_pi_zero_camera_mount/camera_mount.stl similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/camera_mount.stl rename to printer_mods/Nomsplease/V0_pi_zero_camera_mount/camera_mount.stl diff --git a/printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/pi_zero_mount.step b/printer_mods/Nomsplease/V0_pi_zero_camera_mount/pi_zero_mount.step similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/pi_zero_mount.step rename to printer_mods/Nomsplease/V0_pi_zero_camera_mount/pi_zero_mount.step diff --git a/printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/pi_zero_mount.stl b/printer_mods/Nomsplease/V0_pi_zero_camera_mount/pi_zero_mount.stl similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pi_zero_camera_mount/pi_zero_mount.stl rename to printer_mods/Nomsplease/V0_pi_zero_camera_mount/pi_zero_mount.stl diff --git a/printer_mods/Nomsplease/V0_Mods/pocket_watch_rear_relocation/.metadata.yml b/printer_mods/Nomsplease/V0_pocket_watch_rear_relocation/.metadata.yml similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pocket_watch_rear_relocation/.metadata.yml rename to printer_mods/Nomsplease/V0_pocket_watch_rear_relocation/.metadata.yml diff --git a/printer_mods/Nomsplease/V0_Mods/pocket_watch_rear_relocation/README.md b/printer_mods/Nomsplease/V0_pocket_watch_rear_relocation/README.md similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pocket_watch_rear_relocation/README.md rename to printer_mods/Nomsplease/V0_pocket_watch_rear_relocation/README.md diff --git a/printer_mods/Nomsplease/V0_Mods/pocket_watch_rear_relocation/pocket_watch_rear_mount.step b/printer_mods/Nomsplease/V0_pocket_watch_rear_relocation/pocket_watch_rear_mount.step similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pocket_watch_rear_relocation/pocket_watch_rear_mount.step rename to printer_mods/Nomsplease/V0_pocket_watch_rear_relocation/pocket_watch_rear_mount.step diff --git a/printer_mods/Nomsplease/V0_Mods/pocket_watch_rear_relocation/pocket_watch_rear_mount.stl b/printer_mods/Nomsplease/V0_pocket_watch_rear_relocation/pocket_watch_rear_mount.stl similarity index 100% rename from printer_mods/Nomsplease/V0_Mods/pocket_watch_rear_relocation/pocket_watch_rear_mount.stl rename to printer_mods/Nomsplease/V0_pocket_watch_rear_relocation/pocket_watch_rear_mount.stl diff --git a/printer_mods/Spaghetti-Bolognese/Z_drive_motor_mount/.metadata.yml b/printer_mods/Spaghetti-Bolognese/Z_drive_motor_mount/.metadata.yml index 7edf8ce3b..84687c32b 100644 --- a/printer_mods/Spaghetti-Bolognese/Z_drive_motor_mount/.metadata.yml +++ b/printer_mods/Spaghetti-Bolognese/Z_drive_motor_mount/.metadata.yml @@ -1,5 +1,5 @@ cad: -- Z_Motor_Mount _B.f3d +- Z_Motor_Mount_B.f3d - Z_Motor_Mount_A.f3d description: Z drive motor mount bracket mod to improve pulley to belt alignment images: diff --git a/printer_mods/Spaghetti-Bolognese/Z_drive_motor_mount/Z_Motor_Mount__B.f3d b/printer_mods/Spaghetti-Bolognese/Z_drive_motor_mount/Z_Motor_Mount_B.f3d similarity index 100% rename from printer_mods/Spaghetti-Bolognese/Z_drive_motor_mount/Z_Motor_Mount__B.f3d rename to printer_mods/Spaghetti-Bolognese/Z_drive_motor_mount/Z_Motor_Mount_B.f3d diff --git a/printer_mods/albert/IKEA_Dioder_Led_Mount/.metadata.yml b/printer_mods/albert/IKEA_Dioder_Led_Mount/.metadata.yml index 9a48691dd..a18a317a4 100644 --- a/printer_mods/albert/IKEA_Dioder_Led_Mount/.metadata.yml +++ b/printer_mods/albert/IKEA_Dioder_Led_Mount/.metadata.yml @@ -1,5 +1,5 @@ cad: -- Dioder Led Mount.step +- Dioder_Led_Mount.step description: A mount for the IKEA Dioder LED strip images: - Dioder_Led_Mount_Render_1.png diff --git a/printer_mods/btp/Galileo_Switchwire_Chain_Mount/.metadata.yml b/printer_mods/btp/Galileo_Switchwire_Chain_Mount/.metadata.yml index 1a4d87c5b..3c6cbb845 100644 --- a/printer_mods/btp/Galileo_Switchwire_Chain_Mount/.metadata.yml +++ b/printer_mods/btp/Galileo_Switchwire_Chain_Mount/.metadata.yml @@ -1,7 +1,7 @@ cad: [] description: Modified chain mount position to cater for difference with Galileo Clockwork images: -- switchwire chain.jpeg +- switchwire_chain.jpeg mod_version: 1 printer_compatibility: - VSW diff --git a/printer_mods/deepfriedheroin/v0_power_wagos/.metadata.yml b/printer_mods/deepfriedheroin/v0_power_wagos/.metadata.yml index fe9359e43..43b1343d6 100644 --- a/printer_mods/deepfriedheroin/v0_power_wagos/.metadata.yml +++ b/printer_mods/deepfriedheroin/v0_power_wagos/.metadata.yml @@ -1,6 +1,6 @@ cad: -- cad/v0_3x3_wago v2.f3d -- cad/v0_3x3_wago v2.step +- cad/v0_3x3_wago_v2.f3d +- cad/v0_3x3_wago_v2.step description: Easy to install Wago mounts for v0 mains images: - images/mains_wago_v0_1.jpeg diff --git a/printer_mods/eddie/V1.8_12mm_Z_Mod/.metadata.yml b/printer_mods/eddie/V1.8_12mm_Z_Mod/.metadata.yml index 93342c92e..c0f645d1a 100644 --- a/printer_mods/eddie/V1.8_12mm_Z_Mod/.metadata.yml +++ b/printer_mods/eddie/V1.8_12mm_Z_Mod/.metadata.yml @@ -1,6 +1,6 @@ cad: -- CAD/Z_Shaft_Assembly_12mm v8.f3d -- CAD/Z_Shaft_Assembly_12mm v8.step +- CAD/Z_Shaft_Assembly_12mm_v8.f3d +- CAD/Z_Shaft_Assembly_12mm_v8.step description: Add V1.8 option for 12mm Z rods images: - Images/12mm_Z_Mod.png diff --git a/printer_mods/elcrni/Trident_Internal_Spool_Holder/.metadata.yml b/printer_mods/elcrni/Trident_Internal_Spool_Holder/.metadata.yml index 93dec55b5..2690c71bb 100644 --- a/printer_mods/elcrni/Trident_Internal_Spool_Holder/.metadata.yml +++ b/printer_mods/elcrni/Trident_Internal_Spool_Holder/.metadata.yml @@ -1,5 +1,5 @@ cad: -- CAD/Trident_internal_spool_holder_001 v32.step +- CAD/Trident_internal_spool_holder_001_v32.step description: Internal spool holder for 300 and 350 Tridents. Supports full size 1kg spool images: diff --git a/printer_mods/hartk1213/Voron0_C14Inlet/.metadata.yml b/printer_mods/hartk1213/Voron0_C14Inlet/.metadata.yml index 291fef03d..954e077b3 100644 --- a/printer_mods/hartk1213/Voron0_C14Inlet/.metadata.yml +++ b/printer_mods/hartk1213/Voron0_C14Inlet/.metadata.yml @@ -1,5 +1,5 @@ cad: -- CAD/Voron0_PowerInlet .f3d +- CAD/Voron0_PowerInlet.f3d description: Added a new Power inlet that uses a Fused C14 plug and switch that covers the mains contacts images: diff --git a/printer_mods/hartk1213/Voron0_C14Inlet/CAD/Voron0_PowerInlet_.f3d b/printer_mods/hartk1213/Voron0_C14Inlet/CAD/Voron0_PowerInlet.f3d similarity index 100% rename from printer_mods/hartk1213/Voron0_C14Inlet/CAD/Voron0_PowerInlet_.f3d rename to printer_mods/hartk1213/Voron0_C14Inlet/CAD/Voron0_PowerInlet.f3d diff --git a/printer_mods/mosher/m3_door_hinges/.metadata.yml b/printer_mods/mosher/m3_door_hinges/.metadata.yml index 97d45cd6f..fd1304e1a 100644 --- a/printer_mods/mosher/m3_door_hinges/.metadata.yml +++ b/printer_mods/mosher/m3_door_hinges/.metadata.yml @@ -1,8 +1,8 @@ cad: -- Hinges v2.4 Mod.f3d +- Hinges_v2.4_Mod.f3d description: Simple mod of print in place door hinges, which uses m3 screws as shafts. images: -- Door Hinges mod with M3 35mm.png +- Door_Hinges_mod_with_M3_35mm.png mod_version: 1 printer_compatibility: - V2.4 diff --git a/printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Center_Display/Undivided_skirts/undivided_back_ skirt.stl b/printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Center_Display/Undivided_skirts/undivided_back_skirt.stl similarity index 100% rename from printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Center_Display/Undivided_skirts/undivided_back_ skirt.stl rename to printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Center_Display/Undivided_skirts/undivided_back_skirt.stl diff --git a/printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Left_Display/Undivided_skirts/undivided_back_ skirt.stl b/printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Left_Display/Undivided_skirts/undivided_back_skirt.stl similarity index 100% rename from printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Left_Display/Undivided_skirts/undivided_back_ skirt.stl rename to printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Left_Display/Undivided_skirts/undivided_back_skirt.stl diff --git a/printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/No_Display/Undivided_skirts/undivided_back_ skirt.stl b/printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/No_Display/Undivided_skirts/undivided_back_skirt.stl similarity index 100% rename from printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/No_Display/Undivided_skirts/undivided_back_ skirt.stl rename to printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/No_Display/Undivided_skirts/undivided_back_skirt.stl diff --git a/printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Right_Display/Undivided_skirts/undivided_back_ skirt.stl b/printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Right_Display/Undivided_skirts/undivided_back_skirt.stl similarity index 100% rename from printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Right_Display/Undivided_skirts/undivided_back_ skirt.stl rename to printer_mods/ponkotsu1/V0_Launchpad_Skirt/STL/Right_Display/Undivided_skirts/undivided_back_skirt.stl diff --git a/printer_mods/richardjm/snap-latch-2020/.metadata.yml b/printer_mods/richardjm/snap-latch-2020/.metadata.yml index cc6ecc6ac..778fbc963 100644 --- a/printer_mods/richardjm/snap-latch-2020/.metadata.yml +++ b/printer_mods/richardjm/snap-latch-2020/.metadata.yml @@ -1,5 +1,5 @@ cad: -- CAD/NewLatch v108.f3d +- CAD/NewLatch_v108.f3d description: Quick release panel latch inspired by the work of others. images: - Images/Latch-v68-3mm.jpg diff --git a/printer_mods/tameike/DIN_Rail_2020_holder/.metadata.yml b/printer_mods/tameike/DIN_Rail_2020_holder/.metadata.yml index 4db1501ae..1ebc0af28 100644 --- a/printer_mods/tameike/DIN_Rail_2020_holder/.metadata.yml +++ b/printer_mods/tameike/DIN_Rail_2020_holder/.metadata.yml @@ -1,5 +1,5 @@ cad: -- DIN rail 2020 holder.f3d +- DIN_rail_2020_holder.f3d description: Attaching DIN Rails to 2020 images: [] mod_version: 1 diff --git a/printer_mods/togi/exhaust_housing_side_fitting/.metadata.yml b/printer_mods/togi/exhaust_housing_side_fitting/.metadata.yml index e14de5523..e92d7ace9 100644 --- a/printer_mods/togi/exhaust_housing_side_fitting/.metadata.yml +++ b/printer_mods/togi/exhaust_housing_side_fitting/.metadata.yml @@ -1,5 +1,5 @@ cad: -- Exhast Housing Side Fitting.f3d +- Exhast_Housing_Side_Fitting.f3d description: Moves the exhaust housing bowden fitting 90 degrees to allow the printer to stand closer to a wall images: diff --git a/printer_mods/yenda/vsw_more_robust_belt_paths/.metadata.yml b/printer_mods/yenda/vsw_more_robust_belt_paths/.metadata.yml index ae471b229..91355bf47 100644 --- a/printer_mods/yenda/vsw_more_robust_belt_paths/.metadata.yml +++ b/printer_mods/yenda/vsw_more_robust_belt_paths/.metadata.yml @@ -1,7 +1,7 @@ cad: -- cad/motor_mounts v1.f3d -- cad/xz blocks v3.f3d -- cad/upper_xz v6.f3d +- cad/motor_mounts_v1.f3d +- cad/xz_blocks_v3.f3d +- cad/upper_xz_v6.f3d description: Small mods to belt routing components to ensure a better/more robust alignment images: