Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support 1.21.1 #439

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Support 1.21.1 #439

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8964d0f
Support 1.21.1
Icyadam14 Nov 27, 2024
b447d03
Merge branch 'master' into master
rom1504 Nov 27, 2024
a97117b
Update actions/upload-artifact to v4
Icyadam14 Nov 27, 2024
39eaa48
Merge branch 'master' of https://github.com/Icyadam14/prismarine-viewer
Icyadam14 Nov 27, 2024
b45d8fb
Merge branch 'master' into master
rom1504 Nov 27, 2024
955af3a
Merge branch 'master' of https://github.com/Icyadam14/prismarine-viewer
Icyadam14 Nov 27, 2024
774dce2
Attempt to fix CI
Icyadam14 Nov 27, 2024
18c4759
Adding some logging to debug CI
Icyadam14 Nov 27, 2024
39f61d4
Adding more logging
Icyadam14 Nov 27, 2024
15e8cce
Adjusted logs
Icyadam14 Nov 27, 2024
46e6caf
More logging changes
Icyadam14 Nov 27, 2024
618b473
Merge branch 'master' into master
rom1504 Jan 8, 2025
a1d85df
Update modelsBuilder.js for logging
rom1504 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
mcVersion: ['1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.1', '1.16.4', '1.17.1', '1.18.1', '1.19', '1.20.1']
mcVersion: ['1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.1', '1.16.4', '1.17.1', '1.18.1', '1.19', '1.20.1', '1.21.1']
fail-fast: false

steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Web based viewer for servers and bots

[<img src="https://prismarinejs.github.io/prismarine-viewer/test_1.18.1.png" alt="viewer" width="300">](https://prismarinejs.github.io/prismarine-viewer/)

Supports versions 1.8.8, 1.9.4, 1.10.2, 1.11.2, 1.12.2, 1.13.2, 1.14.4, 1.15.2, 1.16.1, 1.16.4, 1.17.1, 1.18.1, 1.19, 1.20.1.
Supports versions 1.8.8, 1.9.4, 1.10.2, 1.11.2, 1.12.2, 1.13.2, 1.14.4, 1.15.2, 1.16.1, 1.16.4, 1.17.1, 1.18.1, 1.19, 1.20.1, 1.21.1.

## Install

Expand Down
1 change: 1 addition & 0 deletions viewer/lib/modelsBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ function prepareModel (model, texturesJson) {
if (face.texture.charAt(0) === '#') {
face.texture = JSON.parse(JSON.stringify(model.textures[face.texture.substr(1)]))
} else {
console.log(texturesJson)
let name = face.texture
name = cleanupBlockName(name)
face.texture = JSON.parse(JSON.stringify(texturesJson[name]))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here some name is absent from texturesJson

Expand Down
2 changes: 1 addition & 1 deletion viewer/lib/version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const supportedVersions = ['1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.1', '1.16.4', '1.17.1', '1.18.1', '1.19', '1.20.1']
const supportedVersions = ['1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.1', '1.16.4', '1.17.1', '1.18.1', '1.19', '1.20.1', '1.21.1']

const lastOfMajor = {}
for (const version of supportedVersions) {
Expand Down
Loading