Skip to content

Commit 9e3e98b

Browse files
author
ozelot379
committed
Merge branch 'develop' into 'master'
Develop See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!44
2 parents 5172f86 + 463ec60 commit 9e3e98b

3 files changed

Lines changed: 15 additions & 11 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Snapshots versions may are also not supported
2626

2727
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)
2828

29-
If it crashed, it doesn't necessarily have to do with the texture pack and this converter can't do much
29+
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
3030

3131
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:
3232
- UI
@@ -52,6 +52,9 @@ Tested browsers:
5252

5353
Internet Explorer or old Edge are not supported!
5454

55+
## CLI
56+
Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockCli
57+
5558
## API
5659
Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockApi
5760

‎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": "ConvertJavaTextureToBedrock",
4-
"version": "3.3.3",
4+
"version": "3.3.4",
55
"description": "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": "^3.3.2",
26+
"@ozelot379/convert-minecraft-java-texture-to-bedrock": "3.3.4",
2727
"clean-webpack-plugin": "^3.0.0",
2828
"css-loader": "^3.2.0",
2929
"favicons-webpack-plugin": "^1.0.1",

‎yarn.lock‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -588,22 +588,23 @@
588588
"@babel/runtime" "^7.7.2"
589589
core-js "^3.4.1"
590590

591-
"@ozelot379/convert-minecraft-java-texture-to-bedrock@^3.3.2":
592-
version "3.3.3"
593-
resolved "https://registry.yarnpkg.com/@ozelot379/convert-minecraft-java-texture-to-bedrock/-/convert-minecraft-java-texture-to-bedrock-3.3.3.tgz#c19c09e6e3eeaa749114f12e23bb9bb756363aad"
594-
integrity sha512-pTq1m1265KzmJ3xK/jqavJjOe0hUYNDWY5yiVDWnVE/r4e/6lCBJzhylFuj4Ltxjrbc9bp0//M1LsvTzfmwA5w==
591+
"@ozelot379/convert-minecraft-java-texture-to-bedrock@3.3.4":
592+
version "3.3.4"
593+
resolved "https://registry.yarnpkg.com/@ozelot379/convert-minecraft-java-texture-to-bedrock/-/convert-minecraft-java-texture-to-bedrock-3.3.4.tgz#8d28f643298dbf42d975db93042c540ceac56921"
594+
integrity sha512-y0i1bYnliLYZiPOMjXtx81c4zckJIAs1VekqM7ETd7Zl/o4TQHuzr+PC8Yrjo8Kf8NN1SgQX85VhdE8DPASKbA==
595595
dependencies:
596-
"@ozelot379/jimp-plugins" "https://github.com/ozelot379/jimp-plugins/tarball/master"
596+
"@ozelot379/jimp-plugins" "^1.2.1"
597597
fs-extra "^8.1.0"
598598
jimp "^0.9.3"
599599
jszip "^3.2.2"
600600
readdirp "^3.1.2"
601601
tga "^1.0.3"
602602
uuid "^3.3.3"
603603

604-
"@ozelot379/jimp-plugins@https://github.com/ozelot379/jimp-plugins/tarball/master":
605-
version "1.2.0"
606-
resolved "https://github.com/ozelot379/jimp-plugins/tarball/master#352f94fecc751fc87bb785028b8c21ae959bede9"
604+
"@ozelot379/jimp-plugins@^1.2.1":
605+
version "1.2.1"
606+
resolved "https://registry.yarnpkg.com/@ozelot379/jimp-plugins/-/jimp-plugins-1.2.1.tgz#f1c197977f10333ced401d611bb24b380f523712"
607+
integrity sha512-PcIwwzXSaAivQYdc0BYmEiZigW2J7Y6YyAeBwNtxesltki3lmFDQR8Hv9h+I0qRVHEC592sh6jdMC/0IPqXB8Q==
607608

608609
"@types/anymatch@*":
609610
version "1.3.1"

0 commit comments

Comments
 (0)