Merge branch 'develop' into 'master'

Develop See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!56
ModifiedCommand · Nov 10, 2020 · 554769d · 554769d
2 parents 9a1c66c + 5f06437
commit 554769d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
@@ -30,5 +30,4 @@ Browser:
 System OS: 
 
 **Texture pack**
-(optimal, but on advantage, so that issues can be analyzed and fixed more precisely)
 Link to download: 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [4.1.0]
+- Bedrock manifest format version 2
+- Convert java mcmeta description array
+- Horse converter are now experimental
+
 ## [4.0.5]
 - Set alpha to `2` in `OverlayToTranslateConverter`
 - Mark errors logs red

diff --git a/README.md b/README.md
@@ -19,10 +19,13 @@ It supports to convert blocks, items, entities, paintings, particles, map icons,
 
 Please note:
 
+- No guarantee it will work
+- Please notice your browser is be supported
+- Each texture pack could be different and may not work or only partially
 - 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 or fonts are not supported, only classic Vanilla textures
-- Snapshots versions may are also not supported
+- Shaders or OptiFine or 3d textures or mods or datapacks or custom models or fonts are not supported, only classic Vanilla textures
+- Snapshots or never versions may are also not supported
 - If textures of sprites (For instance banner pattern, painting and particle) are only partially available, the missing will be transparent
 - 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 should be a bug in Minecraft

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
   "productName": "ConvertJavaTextureToBedrockWebApp",
-  "version": "4.0.5",
+  "version": "4.1.0",
   "description": "Web app for 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-api": "4.0.5",
+    "@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "4.1.0",
     "clean-webpack-plugin": "3.0.0",
     "css-loader": "3.4.2",
     "favicons-webpack-plugin": "1.0.2",

diff --git a/src/js/index.mjs b/src/js/index.mjs
@@ -205,7 +205,7 @@ document.addEventListener("DOMContentLoaded", () => {
             icon: "error"
         });
 
-        _log(`ERROR: ${err.message}`, "error");
+        _log(`ERROR: ${err.message}`, "red");
     }
 
     /**

diff --git a/webpack.config.js b/webpack.config.js
@@ -7,9 +7,7 @@ const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
 const PACKAGE = require("./package");
 const TerserJSPlugin = require("terser-webpack-plugin");
 
-const {env} = process;
-
-const isDebug = (env.NODE_ENV === "development");
+const isDebug = (process.env.NODE_ENV === "development");
 
 module.exports = {
     devtool: false,
-Original file line number
+Diff line change
@@ Expand Up / @@ -205,7 +205,7 @@ document.addEventListener("DOMContentLoaded", () => { @@
                 icon: "error"
             });
-            _log(`ERROR: ${err.message}`, "error");
+            _log(`ERROR: ${err.message}`, "red");
         }
         /**
@@ Expand Down @@