Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
fieldOfView committed May 2, 2022
2 parents 35394c4 + 9e1b3e6 commit 5692503
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 6 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/create_tagged_release_with_packages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "Cura-plugin release"

on:
push:
tags:
- "v*"

jobs:
create-curapackages:
name: "Tagged Release"
runs-on: "ubuntu-latest"

steps:
- uses: actions/checkout@v3
with:
path: "build"
submodules: "recursive"
- uses: fieldOfView/cura-plugin-packager-action@main
with:
source_folder: "build"
package_info_path: "build/.github/workflows/package.json"
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
files: |
*.curapackage
16 changes: 16 additions & 0 deletions .github/workflows/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"author": {
"author_id": "fieldofview",
"display_name": "fieldOfView",
"email": "[email protected]",
"website": "http://fieldofview.com"
},
"description": "Adds a Z Offset setting to change the distance between the nozzle and the buildplate.\n\nThe development of this plugin can be sponsored via Github Sponsors (https://github.com/sponsors/fieldofview) or Paypal (https://www.paypal.me/fieldofview)",
"display_name": "Z Offset Setting",
"package_id": "ZOffsetPlugin",
"package_type": "plugin",
"package_version": "0.0.0",
"sdk_version": 0,
"sdk_version_semver": "0.0.0",
"website": "https://github.com/fieldOfView/Cura-ZOffsetPlugin"
}
4 changes: 2 additions & 2 deletions ZOffsetPlugin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018 fieldOfView
# Copyright (c) 2022 Aldo Hoeben / fieldOfView
# The ZOffsetPlugin is released under the terms of the AGPLv3 or higher.

import re
Expand Down Expand Up @@ -35,7 +35,7 @@ def __init__(self):
}
self._settings_dict["adhesion_z_offset_extensive_processing"] = {
"label": "Extensive Z Offset Processing",
"description": "Apply the Z Offset throughout the Gcode file instead of affecting the coordinate system. Turning this option on will increae the processing time so it is recommended to leave it off.",
"description": "Apply the Z Offset throughout the Gcode file instead of affecting the coordinate system. Turning this option on will increase the processing time so it is recommended to leave it off, but it may be needed for some firmware versions.",
"type": "bool",
"default_value": False,
"value": "True if machine_gcode_flavor == \"Griffin\" else False",
Expand Down
2 changes: 1 addition & 1 deletion __init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018 fieldOfView
# Copyright (c) 2022 Aldo Hoeben / fieldOfView
# The ZOffsetPlugin is released under the terms of the AGPLv3 or higher.

from . import ZOffsetPlugin
Expand Down
6 changes: 3 additions & 3 deletions plugin.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "Z Offset plugin",
"name": "Z-Offset plugin",
"author": "fieldOfView",
"version": "3.5.7",
"version": "3.6.0",
"description": "Adds a Z Offset setting to change the distance between the nozzle and the buildplate",
"api": 5,
"supported_sdk_versions": ["5.0.0", "6.0.0", "7.0.0"]
"supported_sdk_versions": ["5.0.0", "6.0.0", "7.0.0", "8.0.0"]
}

0 comments on commit 5692503

Please sign in to comment.