Skip to content

Commit

Permalink
Merge branch 'mainsail-crew:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeanon committed Mar 28, 2024
2 parents 94e0628 + 18a7f6e commit e31af66
Show file tree
Hide file tree
Showing 85 changed files with 4,374 additions and 2,517 deletions.
10 changes: 6 additions & 4 deletions .github/label-actions.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Configuration for Label Actions - https://github.com/dessant/label-actions

not on Github:
not an Issue:
issues:
comment: |
Ahoi!
Expand All @@ -9,10 +9,12 @@ not on Github:
Many helpful people will not see your message here and you are
unlikely to get a useful response.
We use github to handle bugreports, feature requests and
planning new releases.
We use the Github Issue-Tracker only for development related
topics, like feature requests, bug reports etc. To get help,
please join our Discord-Server or ask in Github Discussions:
Please use our Discord-Server for help: [discord.gg/mainsail](https://discord.gg/mainsail)
- [discord.gg/mainsail](https://discord.gg/mainsail)
- [GitHub Discussions](https://github.com/orgs/mainsail-crew/discussions)
This ticket will be automatically closed.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:

- name: Check package.json was changed
id: changed-file-package-json
uses: tj-actions/changed-files@v23
uses: tj-actions/changed-files@v41
with:
sha: ${{ github.event.pull_request.head.sha }}

- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
if: contains(steps.changed-file-package-json.outputs.modified_files, 'package.json')
with:
node-version: 20
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@v4

- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20

Expand All @@ -39,7 +39,7 @@ jobs:
- name: Copy output
run: cp ${{ github.workspace }}/dist/mainsail.zip mainsail-latest.zip

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: mainsail-latest.zip
path: mainsail-latest.zip
2 changes: 1 addition & 1 deletion .github/workflows/check-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: Validate PR title
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v5
- uses: amannn/action-semantic-pull-request@v5.4.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_locale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v23
uses: tj-actions/changed-files@v41
with:
sha: ${{ github.event.pull_request.head.sha }}
files: 'src/locales/*.json'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code_style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}

- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
fetch-depth: 0

- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20

Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'develop'
token: ${{ secrets.PAT }}
Expand All @@ -141,7 +141,7 @@ jobs:
- name: Show CHANGELOG
run: |
cat CHANGELOG.md
- uses: stefanzweifel/git-auto-commit-action@v4
- uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: 'docs(changelog): update changelog'
file_pattern: CHANGELOG.md
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4

- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20

Expand All @@ -28,6 +28,6 @@ jobs:
run: npm run build

- name: Cypress run
uses: cypress-io/github-action@v4
uses: cypress-io/github-action@v6
with:
start: npm run preview
41 changes: 41 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,47 @@
# Changelog
All notable changes to Mainsail will be documented in this file.

## [2.10.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.10.0) - 2024-02-15
### Features

- **history**: Add interrupted state to history job ([#1738](https://github.com/mainsail-crew/mainsail/pull/1738))
- Add ability to re-arrange job queue's items ([#1692](https://github.com/mainsail-crew/mainsail/pull/1692))
- Add sum + eta in jobqueue panel ([#1770](https://github.com/mainsail-crew/mainsail/pull/1770))
- Add devices dialog in editor ([#1765](https://github.com/mainsail-crew/mainsail/pull/1765))
- Add ability to add history items to job queue ([#1778](https://github.com/mainsail-crew/mainsail/pull/1778))

### Bug Fixes and Improvements

- **console**: Fix color of autocomplete and command list ([#1733](https://github.com/mainsail-crew/mainsail/pull/1733))
- **timelapse**: Fix issue with changing timelapse settings ([#1745](https://github.com/mainsail-crew/mainsail/pull/1745))
- Incorrect scaling of images in dialogImage ([#1746](https://github.com/mainsail-crew/mainsail/pull/1746))
- Show extruder extra menu without load/unload macros ([#1747](https://github.com/mainsail-crew/mainsail/pull/1747))
- Fix ETA calculation from jobqueue during print preheat ([#1773](https://github.com/mainsail-crew/mainsail/pull/1773))
- File upload rate displays `NaN` instead of an actual value ([#1777](https://github.com/mainsail-crew/mainsail/pull/1777))

### Performance

- Batch gcode file metadata requests ([#1737](https://github.com/mainsail-crew/mainsail/pull/1737))

### Refactor

- Refactor spoolman integration to support v2 response ([#1749](https://github.com/mainsail-crew/mainsail/pull/1749))
- Refactor heightmap page ([#1759](https://github.com/mainsail-crew/mainsail/pull/1759))

### Localization

- **da**: Update danish translation ([#1757](https://github.com/mainsail-crew/mainsail/pull/1757))
- **de**: Update german locale ([#1772](https://github.com/mainsail-crew/mainsail/pull/1772))
- **en**: Fix typo in DescriptionPreviouslyThrottled ([#1776](https://github.com/mainsail-crew/mainsail/pull/1776))
- **it**: Update italian translation ([#1763](https://github.com/mainsail-crew/mainsail/pull/1763))
- **zh**: Update chinese locale ([#1767](https://github.com/mainsail-crew/mainsail/pull/1767))

### Other

- **deps**: Update @sindarius/gcodeviewer ([#1755](https://github.com/mainsail-crew/mainsail/pull/1755))
- Update github issue bot text ([#1743](https://github.com/mainsail-crew/mainsail/pull/1743))
- Fix typo in bot text ([#1748](https://github.com/mainsail-crew/mainsail/pull/1748))

## [2.9.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.9.1) - 2023-12-31
### Bug Fixes and Improvements

Expand Down
Loading

0 comments on commit e31af66

Please sign in to comment.