Skip to content

Commit 041218a

Browse files
author
ozelot379
committed
Merge branch 'develop' into 'master'
Develop See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!53
2 parents 86cffa7 + d322e6c commit 041218a

5 files changed

Lines changed: 24 additions & 21 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [4.0.2]
4+
- Fix `pack_format` `6`
5+
- Remove convert piglin
6+
- Fix banner pattern black
7+
- Fix banner pattern preview max size
8+
- Fix banner illager pattern
9+
- Warn for partially missing sprite images (For instance banner pattern, painting and particle), because may they will be transparent in the result
10+
311
## [3.6.1]
412
- Fix root folder in sub folder in some wrong texture packs
513

‎README.md‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,22 @@ It supports the follow Minecraft versions:
1111
| Minecraft | Version |
1212
|-----------|---------|
1313
| Java | v1.13.x, v1.14.x, v1.15.x or v1.16.x |
14-
| Bedrock | v1.16.x |
14+
| Bedrock | >= v1.16.20 |
1515

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

1818
It supports to convert blocks, items, entities, paintings, particles, map icons, mob effects and hotbar
1919

20-
Some conversions of HD texture packs may takes a while
20+
Please note:
2121

22-
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
23-
24-
Shaders or OptiFine or 3d textures or mods or datapacks or fonts are not supported, only classic Vanilla textures
25-
26-
Snapshots versions may are also not supported
27-
28-
Please reopen Minecraft after selecting the converted texture pack, because in the current version it seems to be a bug to reload the texture cache (Otherwise it's possible that you will have a mix between your previous and new texture pack, which can lead to appearance bugs that would not occur)
29-
30-
If it crashed, it doesn't necessarily have to do with the texture pack and this converter can't do much if it should be a bug in Minecraft
22+
- Some conversions of HD texture packs may takes a while
23+
- 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
24+
- Shaders or OptiFine or 3d textures or mods or datapacks or fonts are not supported, only classic Vanilla textures
25+
- Snapshots versions may are also not supported
26+
- If textures of sprites (For instance banner pattern, painting and particle) are only partially available, the missing will be transparent
27+
- Please reopen Minecraft after selecting the converted texture pack, because in the current version it seems to be a bug to reload the texture cache (Otherwise it's possible that you will have a mix between your previous and new texture pack, which can lead to appearance bugs that would not occur)
28+
- If it crashed, it doesn't necessarily have to do with the texture pack and this converter can't do much if it should be a bug in Minecraft
29+
- Please don't report Java or Bedrock version changes
3130

3231
Some experimental conversions are disabled by default, but can be enabled if you want to try, but please be warned, it contains many bugs and may are not beautiful and may not usable:
3332
- UI

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
33
"productName": "ConvertJavaTextureToBedrockWebApp",
4-
"version": "3.6.1",
4+
"version": "4.0.2",
55
"description": "Web app for convert Minecraft Java texture packs to Bedrock texture packs",
66
"keywords": [
77
"Minecraft",
@@ -23,7 +23,7 @@
2323
"homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
2424
"dependencies": {},
2525
"devDependencies": {
26-
"@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "3.6.1",
26+
"@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "4.0.2",
2727
"clean-webpack-plugin": "3.0.0",
2828
"css-loader": "3.4.2",
2929
"favicons-webpack-plugin": "1.0.2",

‎src/js/worker.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
import {
2-
AbstractLog,
3-
ArrayInput,
4-
ConvertJavaTextureToBedrockApi,
5-
FileInputEntry,
6-
FileOutput
7-
} from "@ozelot379/convert-minecraft-java-texture-to-bedrock-api";
1+
import {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "@ozelot379/convert-base-api";
2+
import {ConvertJavaTextureToBedrockApi} from "@ozelot379/convert-minecraft-java-texture-to-bedrock-api";
83

9-
addEventListener("message", async (e) => {
4+
addEventListener("message", async e => {
105
try {
116
const {files, options} = e.data;
127

‎webpack.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ module.exports = {
4444
resolve: {
4545
alias: {
4646
fs: __dirname + "/src/js/browserify/fs",
47+
jszip: __dirname + "/node_modules/jszip/lib/index.js",
4748
path: __dirname + "/src/js/browserify/path"
4849
}
4950
},

0 commit comments

Comments
 (0)