Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rom1504 authored Jan 8, 2025
2 parents 46e6caf + c2c89a1 commit 618b473
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- run: npm run jestTest -- -t ${{ matrix.mcVersion }}
- uses: actions/upload-artifact@v4
with:
name: test_picture
name: test_picture-${{ matrix.mcVersion }}
path: test/test_*.png
DeployPages:
runs-on: ubuntu-latest
Expand All @@ -57,7 +57,9 @@ jobs:
- name: Download build
uses: actions/[email protected]
with:
name: test_picture
path: .
pattern: test_picture-*
merge-multiple: true
- name: Create commits
run: |
git config user.name 'rom1504bot'
Expand Down
7 changes: 7 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### 1.29.0
* [Update upload action](https://github.com/PrismarineJS/prismarine-viewer/commit/db8bfb0f9745d4b26ce73e07b9b92c586e727117) (thanks @rom1504)
* [Added support for proxy (#429)](https://github.com/PrismarineJS/prismarine-viewer/commit/02b74ff8b84263c49b61d38626dedc7b18afd61a) (thanks @sefirosweb)
* [Bump actions/download-artifact from 2 to 4.1.7 in /.github/workflows (#433)](https://github.com/PrismarineJS/prismarine-viewer/commit/f24ea1572d10953eab4a7181a61ee45d310d680e) (thanks @dependabot[bot])
* [Bump @tweenjs/tween.js from 19.0.0 to 23.1.1 (#424)](https://github.com/PrismarineJS/prismarine-viewer/commit/b7624c36b908ab7bcd41e2d9af4e94c4dad1425e) (thanks @dependabot[bot])
* [Update publish.yml to node 18](https://github.com/PrismarineJS/prismarine-viewer/commit/cd324fe1ed7840eef677100d322d06e3dc08e859) (thanks @rom1504)

### 1.28.0
* [Handle missing biome data.](https://github.com/PrismarineJS/prismarine-viewer/commit/853d226615526f6cd0ba2296eb88958d78aee175) (thanks @rom1504)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prismarine-viewer",
"version": "1.28.0",
"version": "1.29.0",
"description": "Web based viewer",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 618b473

Please sign in to comment.