Skip to content

Commit

Permalink
Merge branch 'develop' into 'master'
Browse files Browse the repository at this point in the history
v1.16 support

See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!50
  • Loading branch information
ozelot379 committed Jun 26, 2020
2 parents 9d724cc + 0226322 commit c8dd233
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Which step is previous the error message?

Is it the same error/step or is different if you try multiple times?

Are the textures available/correct on Java version?

**System info**

***Converting***
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## [3.6.0]
- Convert new v1.16 textures
- Convert wither armor texture
- Fix spawn egg mask texture

## [3.5.1]
- Fix conduit textures

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ It supports the follow Minecraft versions:

| Minecraft | Version |
|-----------|---------|
| Java | v1.13.x, v1.14.x or v1.15.x |
| Bedrock | v1.14.x |
| Java | v1.13.x, v1.14.x, v1.15.x or v1.16.x |
| Bedrock | v1.16.x |

This project is inspired by the no longer continued [PCTexture2PE](https://github.com/rodrigojxd/PCTexture2PE)

Expand All @@ -21,7 +21,7 @@ Some conversions of HD texture packs may takes a while

You need a device with corresponding enough RAM (like the file size and content of the texture pack), because the convert it is not stored in a temporary storage, but in the RAM memory

Shaders or OptiFine or 3d textures or mods or datapacks are not supported, only classic Vanilla textures
Shaders or OptiFine or 3d textures or mods or datapacks or fonts are not supported, only classic Vanilla textures

Snapshots versions may are also not supported

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
"productName": "ConvertJavaTextureToBedrockWebApp",
"version": "3.5.1",
"version": "3.6.0",
"description": "Web app for convert Minecraft Java texture packs to Bedrock texture packs",
"keywords": [
"Minecraft",
Expand All @@ -23,7 +23,7 @@
"homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
"dependencies": {},
"devDependencies": {
"@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "3.5.1",
"@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "3.6.0",
"clean-webpack-plugin": "3.0.0",
"css-loader": "3.4.2",
"favicons-webpack-plugin": "1.0.2",
Expand Down

0 comments on commit c8dd233

Please sign in to comment.