Merge branch 'develop' into 'master'

Develop

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

.dockerignore

@@ -0,0 +1,7 @@
+.*
+build
+Dockerfile
+node_modules
+old
+vendor
+*-lock.json

.github/ISSUE_TEMPLATE/issue.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **Describe the issue**
-Please consult the readme before you report an issue
+Please consult the readme and other issues before you report an issue
 
 A clear and concise description of what the issue is.
 

.gitignore

@@ -1,6 +1,9 @@
 .idea
+.npmrc
 build
 node_modules
+old
+vendor
 *.lock
 *-lock.json
 *.log

.npmignore

@@ -1,6 +1,7 @@
-.idea
+.*
 build
+Dockerfile
 node_modules
-*.lock
-*-lock.json
-*.log
+old
+vendor
+*-lock.json

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [4.2.0]
+- Weather converter are now experimental
+- Log current `pack_format` if incompatible
+
 ## [4.1.0]
 - Bedrock manifest format version 2
 - Convert java mcmeta description array

README.md

@@ -1,8 +1,8 @@
-THIS PROJECT IS NO OFFICIAL MINECRAFT PRODUCT - NOT AUTHORIZED OR ASSOCIATED BY MOJANG
+NOT OFFICIAL MINECRAFT PRODUCT. NOT APPROVED BY OR ASSOCIATED WITH MOJANG
 
 ---
 
-# Web app for convert Minecraft Java texture packs to Bedrock texture packs
+# Web app for converting Minecraft Java texture packs to Bedrock texture packs
 
 ## Description
 
@@ -20,8 +20,9 @@ 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
+- Please notice your browser is be supported
+- Works directly in your browser - no upload required and offline usage
 - 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 custom models or fonts are not supported, only classic Vanilla textures
@@ -32,12 +33,14 @@ Please note:
 - Please don't report Java or Bedrock version changes
 
 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:
+- Horses
 - UI
     - Buttons
     - Tabs
     - Dialogs
     - Inventory / Recipe book
     - Crafting tables
+- Weather (Rain/Snow)
 
 ## Requirements
 
@@ -78,7 +81,3 @@ Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockCli
 ## API
 
 Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockApi
-
-## Report issue
-
-Use github repo issues (https://github.com/ozelot379/ConvertJavaTextureToBedrock/issues/new/choose)

package.json

@@ -1,8 +1,8 @@
 {
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
   "productName": "ConvertJavaTextureToBedrockWebApp",
-  "version": "4.1.0",
-  "description": "Web app for convert Minecraft Java texture packs to Bedrock texture packs",
+  "version": "4.2.0",
+  "description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs",
   "keywords": [
     "Minecraft",
     "Texture",
@@ -23,7 +23,7 @@
   "homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
   "dependencies": {},
   "devDependencies": {
-    "@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "4.1.0",
+    "@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "4.2.0",
     "clean-webpack-plugin": "3.0.0",
     "css-loader": "3.4.2",
     "favicons-webpack-plugin": "1.0.2",

src/html/index.html

@@ -34,14 +34,14 @@
         <div class="container">
             <div class="row">
                 <div class="col l6">
-                    <div>Works directly in your browser - no upload and offline</div>
+                    <div>Works directly in your browser - no upload required and offline usage</div>
                     <div>More infos in the <a class="green-text"
                                               href="https://github.com/ozelot379/ConvertJavaTextureToBedrock/blob/master/README.md"
                                               target="_blank">Readme</a></div>
                 </div>
                 <div class="col l6">
                     <div>
-                        THIS PROJECT IS NO OFFICIAL MINECRAFT PRODUCT - NOT AUTHORIZED OR ASSOCIATED BY MOJANG
+                        NOT OFFICIAL MINECRAFT PRODUCT. NOT APPROVED BY OR ASSOCIATED WITH MOJANG
                     </div>
                     <div>&nbsp;</div>
                     <div>
@@ -50,10 +50,6 @@
                     <div>
                         <a class="green-text" href="https://github.com/ozelot379/ConvertJavaTextureToBedrock"
                            target="_blank">Source</a>
-                        &nbsp;-&nbsp;
-                        <a class="green-text"
-                           href="https://github.com/ozelot379/ConvertJavaTextureToBedrock/issues/new/choose"
-                           target="_blank">Report issue</a>
                     </div>
                 </div>
             </div>

update_gh-pages.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+cd ../webapp-gh-pages
+
+rm -rf $(ls -a -I '.' -I '..' -I '.git')
+
+docker pull ozelot379/convert-minecraft-java-texture-to-bedrock-webapp
+
+docker run -d --name convert-minecraft-java-texture-to-bedrock-webapp ozelot379/convert-minecraft-java-texture-to-bedrock-webapp
+
+docker cp convert-minecraft-java-texture-to-bedrock-webapp:/usr/local/apache2/htdocs/ ./
+
+docker container rm convert-minecraft-java-texture-to-bedrock-webapp -f
+
+cp -r htdocs/* .
+
+rm -rf htdocs