Merge branch 'develop' into 'master'

Develop

See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!44

README.md

@@ -26,7 +26,7 @@ Snapshots versions may are also not supported
 
 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)
 
-If it crashed, it doesn't necessarily have to do with the texture pack and this converter can't do much
+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
 
 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:
 - UI
@@ -52,6 +52,9 @@ Tested browsers:
 
 Internet Explorer or old Edge are not supported!
 
+## CLI
+Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockCli
+
 ## API
 Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockApi
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
   "productName": "ConvertJavaTextureToBedrock",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "description": "Convert Minecraft Java texture packs to Bedrock texture packs",
   "keywords": [
     "Minecraft",
@@ -23,7 +23,7 @@
   "homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
   "dependencies": {},
   "devDependencies": {
-    "@ozelot379/convert-minecraft-java-texture-to-bedrock": "^3.3.2",
+    "@ozelot379/convert-minecraft-java-texture-to-bedrock": "3.3.4",
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^3.2.0",
     "favicons-webpack-plugin": "^1.0.1",

yarn.lock

@@ -588,22 +588,23 @@
     "@babel/runtime" "^7.7.2"
     core-js "^3.4.1"
 
-"@ozelot379/convert-minecraft-java-texture-to-bedrock@^3.3.2":
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/@ozelot379/convert-minecraft-java-texture-to-bedrock/-/convert-minecraft-java-texture-to-bedrock-3.3.3.tgz#c19c09e6e3eeaa749114f12e23bb9bb756363aad"
-  integrity sha512-pTq1m1265KzmJ3xK/jqavJjOe0hUYNDWY5yiVDWnVE/r4e/6lCBJzhylFuj4Ltxjrbc9bp0//M1LsvTzfmwA5w==
+"@ozelot379/[email protected].4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@ozelot379/convert-minecraft-java-texture-to-bedrock/-/convert-minecraft-java-texture-to-bedrock-3.3.4.tgz#8d28f643298dbf42d975db93042c540ceac56921"
+  integrity sha512-y0i1bYnliLYZiPOMjXtx81c4zckJIAs1VekqM7ETd7Zl/o4TQHuzr+PC8Yrjo8Kf8NN1SgQX85VhdE8DPASKbA==
   dependencies:
-    "@ozelot379/jimp-plugins" "https://github.com/ozelot379/jimp-plugins/tarball/master"
+    "@ozelot379/jimp-plugins" "^1.2.1"
     fs-extra "^8.1.0"
     jimp "^0.9.3"
     jszip "^3.2.2"
     readdirp "^3.1.2"
     tga "^1.0.3"
     uuid "^3.3.3"
 
-"@ozelot379/jimp-plugins@https://github.com/ozelot379/jimp-plugins/tarball/master":
-  version "1.2.0"
-  resolved "https://github.com/ozelot379/jimp-plugins/tarball/master#352f94fecc751fc87bb785028b8c21ae959bede9"
+"@ozelot379/jimp-plugins@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@ozelot379/jimp-plugins/-/jimp-plugins-1.2.1.tgz#f1c197977f10333ced401d611bb24b380f523712"
+  integrity sha512-PcIwwzXSaAivQYdc0BYmEiZigW2J7Y6YyAeBwNtxesltki3lmFDQR8Hv9h+I0qRVHEC592sh6jdMC/0IPqXB8Q==
 
 "@types/anymatch@*":
   version "1.3.1"