From ce9c7197ce467d7cd30d33b370ca05c055a47b09 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:22:24 -0600 Subject: [PATCH 01/51] Update Footer Links --- src/html/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/html/index.html b/src/html/index.html index 53dd792..ef45adb 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -36,7 +36,7 @@
Works directly in your browser - no upload required and offline usage
More infos in the Readme
@@ -48,7 +48,7 @@ Version: <%= require("./../../package").version %>
- Source
@@ -58,4 +58,4 @@
- \ No newline at end of file + From 895de3dc6b109bb3ade0238388c1749c6d2a9143 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:22:52 -0600 Subject: [PATCH 02/51] Update update_gh-pages.sh --- update_gh-pages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update_gh-pages.sh b/update_gh-pages.sh index f46302d..ddcd1b1 100755 --- a/update_gh-pages.sh +++ b/update_gh-pages.sh @@ -3,9 +3,9 @@ cd ../webapp-gh-pages rm -rf $(ls -a -I '.' -I '..' -I '.git') -docker pull ozelot379/convert-minecraft-java-texture-to-bedrock-webapp +docker pull ModifiedCommand/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 run -d --name convert-minecraft-java-texture-to-bedrock-webapp ModifiedCommand/convert-minecraft-java-texture-to-bedrock-webapp docker cp convert-minecraft-java-texture-to-bedrock-webapp:/usr/local/apache2/htdocs/ ./ From c523c8cdfb93a9f3b144c28c147a82201a440668 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:28:25 -0600 Subject: [PATCH 03/51] Create docker-image.yml --- .github/workflows/docker-image.yml | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..5036541 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,38 @@ +name: Docker Image CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Build the Docker image + run: | + rm -rf $(ls -a -I '.' -I '..' -I '.git') + docker pull ModifiedCommand/convert-minecraft-java-texture-to-bedrock-webapp + docker run -d --name convert-minecraft-java-texture-to-bedrock-webapp ModifiedCommand/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 + + - name: Sigin to git + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + + - name: Commit + run: | + git add . + git commit -m "GitHub Actions" + + - name: Push commit + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: "gh-pages" From 3a2885116842df406dbf5238f066f9f8615143c8 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:29:42 -0600 Subject: [PATCH 04/51] Update docker-image.yml --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 5036541..f345ba8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,8 +14,8 @@ jobs: - name: Build the Docker image run: | rm -rf $(ls -a -I '.' -I '..' -I '.git') - docker pull ModifiedCommand/convert-minecraft-java-texture-to-bedrock-webapp - docker run -d --name convert-minecraft-java-texture-to-bedrock-webapp ModifiedCommand/convert-minecraft-java-texture-to-bedrock-webapp + docker pull modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp + docker run -d --name convert-minecraft-java-texture-to-bedrock-webapp modifiedcommand/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/* . From 0d78232e3c609ffb84af941c51573bfa08575912 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:34:31 -0600 Subject: [PATCH 05/51] Update docker-image.yml --- .github/workflows/docker-image.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f345ba8..477bed0 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,10 +14,7 @@ jobs: - name: Build the Docker image run: | rm -rf $(ls -a -I '.' -I '..' -I '.git') - docker pull modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp - docker run -d --name convert-minecraft-java-texture-to-bedrock-webapp modifiedcommand/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 + docker build . --file Dockerfile cp -r htdocs/* . rm -rf htdocs From eafa469a4fd78c3efb741335028a408e43aae80e Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:35:50 -0600 Subject: [PATCH 06/51] Update docker-image.yml --- .github/workflows/docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 477bed0..67677fe 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -13,6 +13,7 @@ jobs: - uses: actions/checkout@v2 - name: Build the Docker image run: | + echo ls rm -rf $(ls -a -I '.' -I '..' -I '.git') docker build . --file Dockerfile cp -r htdocs/* . From e354f199771e663a174761c3a4624860aaa9f44e Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:36:43 -0600 Subject: [PATCH 07/51] Update docker-image.yml --- .github/workflows/docker-image.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 67677fe..d0602f4 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -11,9 +11,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + + - name: test + run: ls + - name: Build the Docker image run: | - echo ls rm -rf $(ls -a -I '.' -I '..' -I '.git') docker build . --file Dockerfile cp -r htdocs/* . From a5bfafe80e03effab513959aa6c1499ffe5ce267 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:37:50 -0600 Subject: [PATCH 08/51] Update docker-image.yml --- .github/workflows/docker-image.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index d0602f4..50452e5 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -12,13 +12,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: test - run: ls - - name: Build the Docker image run: | rm -rf $(ls -a -I '.' -I '..' -I '.git') - docker build . --file Dockerfile + docker build --file Dockerfile cp -r htdocs/* . rm -rf htdocs From 76b37c5262bd89203d0a0087e1160d9eb9c263fb Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:38:36 -0600 Subject: [PATCH 09/51] Update docker-image.yml --- .github/workflows/docker-image.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 50452e5..a3b4318 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,8 +14,7 @@ jobs: - name: Build the Docker image run: | - rm -rf $(ls -a -I '.' -I '..' -I '.git') - docker build --file Dockerfile + docker build . --file Dockerfile cp -r htdocs/* . rm -rf htdocs From 0464563064803f2b87c5594b06e744efce6c1128 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:43:29 -0600 Subject: [PATCH 10/51] Update package.json --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 139e546..e21864c 100644 --- a/package.json +++ b/package.json @@ -11,19 +11,19 @@ "Java", "Bedrock" ], - "author": "ozelot379", + "author": "modifiedcommand", "license": "GPL-3.0-only", "repository": { "type": "git", - "url": "git+https://github.com/ozelot379/ConvertJavaTextureToBedrock.git" + "url": "git+https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock.git" }, "bugs": { - "url": "https://github.com/ozelot379/ConvertJavaTextureToBedrock/issues" + "url": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/issues" }, - "homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme", + "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "dependencies": {}, "devDependencies": { - "@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "4.2.0", + "@geekcornernpm/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", From 26e13b80173c574f534d3426de5468c6287bb31a Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:50:54 -0600 Subject: [PATCH 11/51] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e21864c..65192f5 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp", + "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", "version": "4.2.0", "description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs", @@ -23,7 +23,7 @@ "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "dependencies": {}, "devDependencies": { - "@geekcornernpm/convert-minecraft-java-texture-to-bedrock-api": "4.2.0", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi#v4.0.6", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", From 61091967c9491d0035fa91f3576a77c932c8d38f Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:58:36 -0600 Subject: [PATCH 12/51] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 65192f5..990beb7 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "node": ">=14.0.0" }, "scripts": { - "build": "webpack" + "build": "node_modules/.bin/webpack --config webpack.config.js" }, - "private": true + "private": false } From 1f668958ae6bd70bd7321d769f7c61999083dde7 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:05:43 -0600 Subject: [PATCH 13/51] Create build.yml --- .github/workflows/build.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..33c6e7f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,36 @@ +name: gh-build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Build + run: | + yarn install + node_modules/.bin/webpack --config webpack.config.js + cp -r build /build + rm -rf /src + + - name: Sigin to git + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + + - name: Commit + run: | + git add . + git commit -m "GitHub Actions" + + - name: Push commit + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: "gh-pages" From c367ec22518dc33eac4a649dcee5434f510e01ed Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:07:39 -0600 Subject: [PATCH 14/51] Delete docker-image.yml --- .github/workflows/docker-image.yml | 35 ------------------------------ 1 file changed, 35 deletions(-) delete mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index a3b4318..0000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Build the Docker image - run: | - docker build . --file Dockerfile - cp -r htdocs/* . - rm -rf htdocs - - - name: Sigin to git - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - - - name: Commit - run: | - git add . - git commit -m "GitHub Actions" - - - name: Push commit - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: "gh-pages" From 5b9f4fe23fb7dfb5cbcbcefbe6f2cf84df7803bd Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:09:37 -0600 Subject: [PATCH 15/51] Update worker.js --- src/js/worker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/worker.js b/src/js/worker.js index 256e119..a3fa89c 100644 --- a/src/js/worker.js +++ b/src/js/worker.js @@ -1,5 +1,5 @@ -import {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "@ozelot379/convert-base-api"; -import {ConvertJavaTextureToBedrockApi} from "@ozelot379/convert-minecraft-java-texture-to-bedrock-api"; +import {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "@geekcornernpm/convert-base-api"; +import {ConvertJavaTextureToBedrockApi} from "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api"; addEventListener("message", async e => { try { From b954fed5da0d5a7658705c1c40060d35c0079d7a Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:14:03 -0600 Subject: [PATCH 16/51] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f27713e..55ba9f6 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Internet Explorer or old Edge are not supported! The latest version is available through Github page -Look at https://ozelot379.github.io/ConvertJavaTextureToBedrock +Look at http://modifiedcommand.github.io/ConvertJavaTextureToBedrock/ ### Docker From ba78b8b82d109f63caff9df96ca5167f1b8e9e16 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:21:38 -0600 Subject: [PATCH 17/51] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 990beb7..a629738 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "path-browserify": "1.0.1", "sweetalert": "2.1.2", "webpack": "4.42.0", - "webpack-cli": "3.3.11", + "webpack-cli": "3.12.0", "worker-loader": "2.0.0" }, "resolutions": { From 9a13ec132985aecb767865bee95e46245c95bfb3 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:42:55 -0600 Subject: [PATCH 18/51] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a629738..6ac35bd 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "path-browserify": "1.0.1", "sweetalert": "2.1.2", "webpack": "4.42.0", - "webpack-cli": "3.12.0", + "webpack-cli": "3.3.12", "worker-loader": "2.0.0" }, "resolutions": { From b26dd1cf768d5ac2ba77df53b04aea56b8a9082f Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:50:37 -0600 Subject: [PATCH 19/51] Update webpack.config.js --- webpack.config.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index b29e42c..d37d8c8 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -22,13 +22,18 @@ module.exports = { use: [MiniCssExtractPlugin.loader, "css-loader", "less-loader"] }, { - test: /worker\.js$/, - loader: "worker-loader", - options: { - name: "[name].[contenthash].js" - } - } - ] + test: /\.worker\.js$/, + use: { + loader: 'worker-loader', + options: { + //name: "[name].[contenthash].js" + name: "[name].js + inline: true, + fallback: false, + } + }, + } + ] }, optimization: { minimizer: (isDebug ? [] : [new TerserJSPlugin({}), new OptimizeCSSAssetsPlugin()]), From 28b92c805513b3fd8dca62ab57f282b7c2db43c5 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:52:13 -0600 Subject: [PATCH 20/51] Update webpack.config.js --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index d37d8c8..5ee3b3b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -27,7 +27,7 @@ module.exports = { loader: 'worker-loader', options: { //name: "[name].[contenthash].js" - name: "[name].js + name: "[name].js" inline: true, fallback: false, } From d964ef449627b54ba43b6c093aa1dfa6b85238a1 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 15:08:20 -0600 Subject: [PATCH 21/51] Update webpack.config.js --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 5ee3b3b..04e590d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -27,7 +27,7 @@ module.exports = { loader: 'worker-loader', options: { //name: "[name].[contenthash].js" - name: "[name].js" + name: "[name].js", inline: true, fallback: false, } From 6be26bf155dd002822776c4f53e047931cce809a Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 3 Feb 2022 15:29:03 -0600 Subject: [PATCH 22/51] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ac35bd..0b66b9f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "dependencies": {}, "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi#v4.0.6", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi#v4.0.7", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", From ac8a9fa16d80f6bb369b1496e4321088779c1ea2 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 00:00:05 -0600 Subject: [PATCH 23/51] Update webpack.config.js --- webpack.config.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 04e590d..cc3bf72 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -26,8 +26,7 @@ module.exports = { use: { loader: 'worker-loader', options: { - //name: "[name].[contenthash].js" - name: "[name].js", + name: "[name].[contenthash].js", inline: true, fallback: false, } From a7a44b8c2a1fe8817f353715b52bebc4c85abcf3 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 00:23:23 -0600 Subject: [PATCH 24/51] Update webpack.config.js --- webpack.config.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webpack.config.js b/webpack.config.js index cc3bf72..fa1b001 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -10,6 +10,10 @@ const TerserJSPlugin = require("terser-webpack-plugin"); const isDebug = (process.env.NODE_ENV === "development"); module.exports = { + stats: { + entrypoints: false, + children: false + }, devtool: false, entry: { index: "./src/js/index.mjs" From 00fa0fd4f6ac2c54a18b7aa2cdcd415a0dddbc62 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 00:27:05 -0600 Subject: [PATCH 25/51] Update worker.js --- src/js/worker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/worker.js b/src/js/worker.js index a3fa89c..878270f 100644 --- a/src/js/worker.js +++ b/src/js/worker.js @@ -1,5 +1,5 @@ -import {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "@geekcornernpm/convert-base-api"; -import {ConvertJavaTextureToBedrockApi} from "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api"; +import AbstractLog, ArrayInput, FileInputEntry, FileOutput from "@geekcornernpm/convert-base-api"; +import ConvertJavaTextureToBedrockApi from "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api"; addEventListener("message", async e => { try { From 95c04569b359ad275cc6624f7c569c71be1d6343 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 00:29:50 -0600 Subject: [PATCH 26/51] Update worker.js --- src/js/worker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/worker.js b/src/js/worker.js index 878270f..a3fa89c 100644 --- a/src/js/worker.js +++ b/src/js/worker.js @@ -1,5 +1,5 @@ -import AbstractLog, ArrayInput, FileInputEntry, FileOutput from "@geekcornernpm/convert-base-api"; -import ConvertJavaTextureToBedrockApi from "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api"; +import {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "@geekcornernpm/convert-base-api"; +import {ConvertJavaTextureToBedrockApi} from "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api"; addEventListener("message", async e => { try { From 64ddd31cb37e3d87950a1a01816f94406f51414e Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 00:39:04 -0600 Subject: [PATCH 27/51] Update index.mjs --- src/js/index.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/index.mjs b/src/js/index.mjs index 24a0a63..1ef289e 100644 --- a/src/js/index.mjs +++ b/src/js/index.mjs @@ -1,7 +1,7 @@ import fileSaver from "file-saver"; import OfflinePluginRuntime from "offline-plugin/runtime"; import swal from "sweetalert"; -import Worker from "./worker.js"; +import { Worker } from "./worker.js"; import "./../css/style.less"; document.addEventListener("DOMContentLoaded", () => { From 434590eb2da483f4f92430e3f377efecb6845af4 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 08:51:16 -0600 Subject: [PATCH 28/51] Made Working --- .github/workflows/build.yml | 26 +++------ package.json | 106 ++++++++++++++++++------------------ src/js/index.mjs | 6 +- src/js/worker.js | 10 ++-- update_gh-pages.sh | 4 +- webpack.config.js | 33 +++++------ 6 files changed, 84 insertions(+), 101 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33c6e7f..4f315a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,22 +15,10 @@ jobs: - name: Build run: | yarn install - node_modules/.bin/webpack --config webpack.config.js - cp -r build /build - rm -rf /src - - - name: Sigin to git - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - - - name: Commit - run: | - git add . - git commit -m "GitHub Actions" - - - name: Push commit - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: "gh-pages" + yarn build + + - name: Deploy 🚀 + uses: JamesIves/github-pages-deploy-action@v4.2.3 + with: + branch: gh-pages # The branch the action should deploy to. + folder: build # The folder the action should deploy. diff --git a/package.json b/package.json index 0b66b9f..4170298 100644 --- a/package.json +++ b/package.json @@ -1,54 +1,54 @@ { - "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", - "productName": "ConvertJavaTextureToBedrockWebApp", - "version": "4.2.0", - "description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs", - "keywords": [ - "Minecraft", - "Texture", - "Pack", - "Convert", - "Java", - "Bedrock" - ], - "author": "modifiedcommand", - "license": "GPL-3.0-only", - "repository": { - "type": "git", - "url": "git+https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock.git" - }, - "bugs": { - "url": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/issues" - }, - "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", - "dependencies": {}, - "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi#v4.0.7", - "clean-webpack-plugin": "3.0.0", - "css-loader": "3.4.2", - "favicons-webpack-plugin": "1.0.2", - "file-saver": "https://github.com/eligrey/FileSaver.js/tarball/9a0a1e4ae2732c2d8eedc0214ef1c0fa32d15150", - "html-webpack-plugin": "3.2.0", - "less": "3.11.1", - "less-loader": "5.0.0", - "materialize-css": "1.0.0", - "mini-css-extract-plugin": "0.8.2", - "offline-plugin": "5.0.7", - "optimize-css-assets-webpack-plugin": "5.0.3", - "path-browserify": "1.0.1", - "sweetalert": "2.1.2", - "webpack": "4.42.0", - "webpack-cli": "3.3.12", - "worker-loader": "2.0.0" - }, - "resolutions": { - "sharp": "0.25.3" - }, - "engines": { - "node": ">=14.0.0" - }, - "scripts": { - "build": "node_modules/.bin/webpack --config webpack.config.js" - }, - "private": false -} + "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", + "productName": "ConvertJavaTextureToBedrockWebApp", + "version": "4.2.0", + "description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs", + "keywords": [ + "Minecraft", + "Texture", + "Pack", + "Convert", + "Java", + "Bedrock" + ], + "author": "modifiedcommand", + "license": "GPL-3.0-only", + "repository": { + "type": "git", + "url": "git+https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock.git" + }, + "bugs": { + "url": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/issues" + }, + "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", + "dependencies": {}, + "devDependencies": { + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi#v4.0.7", + "clean-webpack-plugin": "3.0.0", + "css-loader": "3.4.2", + "favicons-webpack-plugin": "1.0.2", + "file-saver": "https://github.com/eligrey/FileSaver.js/tarball/9a0a1e4ae2732c2d8eedc0214ef1c0fa32d15150", + "html-webpack-plugin": "3.2.0", + "less": "3.11.1", + "less-loader": "5.0.0", + "materialize-css": "1.0.0", + "mini-css-extract-plugin": "0.8.2", + "offline-plugin": "5.0.7", + "optimize-css-assets-webpack-plugin": "5.0.3", + "path-browserify": "1.0.1", + "sweetalert": "2.1.2", + "webpack": "4.42.0", + "webpack-cli": "3.3.12", + "worker-loader": "1.1.1" + }, + "resolutions": { + "sharp": "0.25.3" + }, + "engines": { + "node": ">=14.0.0" + }, + "scripts": { + "build": "node_modules/.bin/webpack --config webpack.config.js" + }, + "private": false +} \ No newline at end of file diff --git a/src/js/index.mjs b/src/js/index.mjs index 1ef289e..a6ff70c 100644 --- a/src/js/index.mjs +++ b/src/js/index.mjs @@ -1,7 +1,7 @@ import fileSaver from "file-saver"; import OfflinePluginRuntime from "offline-plugin/runtime"; import swal from "sweetalert"; -import { Worker } from "./worker.js"; +import Worker from "./worker.js"; import "./../css/style.less"; document.addEventListener("DOMContentLoaded", () => { @@ -163,7 +163,7 @@ document.addEventListener("DOMContentLoaded", () => { * @returns {Promise<>} */ async function afterConvert(e) { - const {log, log_color_class, output} = e.data; + const { log, log_color_class, output } = e.data; if (log) { _log(log, log_color_class); @@ -227,4 +227,4 @@ document.addEventListener("DOMContentLoaded", () => { logs.scrollTop = logs.scrollHeight; // Scroll to bottom } -}); +}); \ No newline at end of file diff --git a/src/js/worker.js b/src/js/worker.js index a3fa89c..1c3cfb1 100644 --- a/src/js/worker.js +++ b/src/js/worker.js @@ -1,9 +1,9 @@ -import {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "@geekcornernpm/convert-base-api"; -import {ConvertJavaTextureToBedrockApi} from "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api"; +import { AbstractLog, ArrayInput, FileInputEntry, FileOutput } from "@geekcornernpm/convert-base-api"; +import { ConvertJavaTextureToBedrockApi } from "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api"; addEventListener("message", async e => { try { - const {files, options} = e.data; + const { files, options } = e.data; const output = { output: await new ConvertJavaTextureToBedrockApi( @@ -16,7 +16,7 @@ addEventListener("message", async e => { * @param {string|undefined} log_color_class */ log(log, log_color_class = undefined) { - postMessage({log, log_color_class}) + postMessage({ log, log_color_class }) } /** @@ -39,4 +39,4 @@ addEventListener("message", async e => { throw err; }) } -}); +}); \ No newline at end of file diff --git a/update_gh-pages.sh b/update_gh-pages.sh index ddcd1b1..491617c 100755 --- a/update_gh-pages.sh +++ b/update_gh-pages.sh @@ -3,9 +3,9 @@ cd ../webapp-gh-pages rm -rf $(ls -a -I '.' -I '..' -I '.git') -docker pull ModifiedCommand/convert-minecraft-java-texture-to-bedrock-webapp +docker pull modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp -docker run -d --name convert-minecraft-java-texture-to-bedrock-webapp ModifiedCommand/convert-minecraft-java-texture-to-bedrock-webapp +docker run -d --name convert-minecraft-java-texture-to-bedrock-webapp modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp docker cp convert-minecraft-java-texture-to-bedrock-webapp:/usr/local/apache2/htdocs/ ./ diff --git a/webpack.config.js b/webpack.config.js index fa1b001..e5950d9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,4 +1,4 @@ -const {CleanWebpackPlugin} = require("clean-webpack-plugin"); +const { CleanWebpackPlugin } = require("clean-webpack-plugin"); const FaviconsWebpackPlugin = require("favicons-webpack-plugin"); const HtmlWebpackPlugin = require("html-webpack-plugin"); const MiniCssExtractPlugin = require("mini-css-extract-plugin"); @@ -7,36 +7,31 @@ const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin"); const PACKAGE = require("./package"); const TerserJSPlugin = require("terser-webpack-plugin"); -const isDebug = (process.env.NODE_ENV === "development"); +//const isDebug = (process.env.NODE_ENV === "development"); +const isDebug = "production"; module.exports = { + devtool: false, stats: { - entrypoints: false, - children: false + children: false }, - devtool: false, entry: { index: "./src/js/index.mjs" }, mode: (isDebug ? "development" : "production"), module: { - rules: [ - { + rules: [{ test: /\.less$/, use: [MiniCssExtractPlugin.loader, "css-loader", "less-loader"] }, { - test: /\.worker\.js$/, - use: { - loader: 'worker-loader', - options: { - name: "[name].[contenthash].js", - inline: true, - fallback: false, - } - }, - } - ] + test: /worker\.js$/, + loader: "worker-loader", + options: { + name: "[name].[contenthash].js" + } + } + ] }, optimization: { minimizer: (isDebug ? [] : [new TerserJSPlugin({}), new OptimizeCSSAssetsPlugin()]), @@ -113,4 +108,4 @@ module.exports = { })] : []) ], target: "web" -}; +}; \ No newline at end of file From 262df42e5824616302d862532a1bc77831b4ff23 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 08:51:52 -0600 Subject: [PATCH 29/51] Update build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f315a2..519508d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: yarn build - name: Deploy 🚀 - uses: JamesIves/github-pages-deploy-action@v4.2.3 - with: - branch: gh-pages # The branch the action should deploy to. - folder: build # The folder the action should deploy. + uses: JamesIves/github-pages-deploy-action@v4.2.3 + with: + branch: gh-pages # The branch the action should deploy to. + folder: build # The folder the action should deploy. From 0a01eb460c71902bd07777c042304ade1da1cfeb Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 09:45:21 -0600 Subject: [PATCH 30/51] Update package.json --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4170298..e5e253d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", - "version": "4.2.0", + "version": "4.2.1", "description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs", "keywords": [ "Minecraft", @@ -23,7 +23,7 @@ "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "dependencies": {}, "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi#v4.0.7", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi#v4.0.8", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", @@ -51,4 +51,4 @@ "build": "node_modules/.bin/webpack --config webpack.config.js" }, "private": false -} \ No newline at end of file +} From 4315386860751e152d01af3c7c6106ed351bac3e Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 09:56:04 -0600 Subject: [PATCH 31/51] Update README.md --- README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 55ba9f6..3819f40 100644 --- a/README.md +++ b/README.md @@ -58,10 +58,7 @@ Tested browsers: Internet Explorer or old Edge are not supported! ## Web app - -The latest version is available through Github page - -Look at http://modifiedcommand.github.io/ConvertJavaTextureToBedrock/ +* The latest version is available through [GitHub pages](http://modifiedcommand.github.io/ConvertJavaTextureToBedrock/) ### Docker @@ -74,10 +71,5 @@ docker run --rm -p 127.0.0.1:8080:80 ozelot379/convert-minecraft-java-texture-to Look at https://hub.docker.com/r/ozelot379/convert-minecraft-java-texture-to-bedrock-webapp -## CLI - -Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockCli - ## API - -Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockApi +* Look at (ModifiedCommand/ConvertJavaTextureToBedrockApi)[https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi] From 092420d2f9a8ea4349627f7cce3f96224d524b57 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 09:56:23 -0600 Subject: [PATCH 32/51] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3819f40..966f3ae 100644 --- a/README.md +++ b/README.md @@ -72,4 +72,4 @@ docker run --rm -p 127.0.0.1:8080:80 ozelot379/convert-minecraft-java-texture-to Look at https://hub.docker.com/r/ozelot379/convert-minecraft-java-texture-to-bedrock-webapp ## API -* Look at (ModifiedCommand/ConvertJavaTextureToBedrockApi)[https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi] +* Look at [ModifiedCommand/ConvertJavaTextureToBedrockApi](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi) From 24772f86f4c18b074f38a82954cb00413b1f146a Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 14:24:55 -0600 Subject: [PATCH 33/51] Added All Old Versions --- CHANGELOG.md | 255 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 245 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c606d0..b5b6634 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,23 +1,23 @@ # Changelog -## [4.2.0] +## [[v4.2.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.2.0) - [a1c27d8](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/a1c27d888058f61bbb3e67170b5f9cb66e3b53a8) - Dec 10, 2020 - Weather converter are now experimental - Log current `pack_format` if incompatible -## [4.1.0] +## [[v4.1.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.1.0) - [554769d](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/554769d6539960cd309d57d42c9f16d5d542dac5) - Nov 10, 2020 - Bedrock manifest format version 2 - Convert java mcmeta description array - Horse converter are now experimental -## [4.0.5] +## [[v4.0.5]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.0.5) - [9a1c66c](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/9a1c66c65b910d283b82efa8636f2ccf4ee86ccb) - Sep 20, 2020 - Set alpha to `2` in `OverlayToTranslateConverter` - Mark errors logs red -## [4.0.3] +## [[v4.0.3]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.0.3) - [86a1afa](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/86a1afa041b8f489bd206affd9e8e9345fd7500f) - Aug 16, 2020 - Log warn logs occurred count - Mark warning logs yellow -## [4.0.2] +## [[v4.0.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.0.2) - [041218a](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/041218a7e2e043949b7439fae2043b0eef0fee56) - Aug 13, 2020 - Fix `pack_format` `6` - Remove convert piglin - Fix banner pattern black @@ -25,18 +25,253 @@ - Fix banner illager pattern - Warn for partially missing sprite images (For instance banner pattern, painting and particle), because may they will be transparent in the result -## [3.6.1] +## [[v3.6.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.6.1) - [86cffa7](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/86cffa7d16a493fccc78f5bb173fd4c9b93f82a9) - Jun 28, 2020 - Fix root folder in sub folder in some wrong texture packs -## [3.6.0] +## [[v3.6.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.6.0) - [c8dd233](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/c8dd2338b43c7bd2877902e73a1bcefa9c3adade) - Jun 26, 2020 - Convert new v1.16 textures - Convert wither armor texture - Fix spawn egg mask texture -## [3.5.1] +## [[v3.5.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.5.1) - [9d724cc](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/9d724cc476895c968943c62c2fd4c213253c1ebf) - Jun 21, 2020 - Fix conduit textures -## [3.5.0] +## [[v3.5.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.5.0) - [b59d942](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/b59d942f9b4ec5093a7acca25f1eef04a0896dda) - Jun 20, 2020 - Convert dolphin texture -Changelog for previous versions are available at https://github.com/ozelot379/ConvertJavaTextureToBedrockApi/blob/master/CHANGELOG.md#341 +## [[v3.4.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.4.1) - [c88c25e](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/c88c25ef0494b5022c804387717fe2d77ef88df2) - Jun 11, 2020 +- "ES module" +- Docker images + +## [[v3.3.4]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.3.4) - [9e3e98b](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/9e3e98bc476ce265e824cbd92dff6d9123060b8c) - May 7, 2020 +- Some minor changes +- Restore CLI + +## [[v3.3.3]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.3.3) - [4f05e94](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/4f05e94227a00cd55f9f4e735ffe33809f64f0f7) - May 3, 2020 +- Improve selected hotbar slot (if not transparent) +- Update readme +- Remove unnecessary build from api and some minor changes + +## [[v3.3.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.3.2) - [101f263](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/101f26350ac0c9a92b4406a01c8116387837aed0) - Apr 27, 2020 +- Update readme + +## [[v3.3.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.3.1) - [ca39990](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/ca39990bc71bac11dae0e287164dbadcfad960b1) - Mar 8, 2020 +- Split in separate repos + +## [[v3.3.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.3.0) - [1507802](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/150780291e8e0c42fe3a56df454959d704fe2067) - Mar 7, 2020 +- Split in separate repos + +## [[v3.2.8]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.2.8) - [e3d1a5c](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/e3d1a5c5c0c384ca69d09db09013db179cbff0b6) - Feb 14, 2020 +- Fix possible bug in redstone cross + +## [[v3.2.7]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.2.7) - [31adb56](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/31adb568192cdcdb7f203df0d2dc23d9a92b1a89) - Jan 29, 2020 +- Add dark theme + +## [[v3.2.6]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.2.6) - [9315a03](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/9315a03815eb11b1e22f4cfcea1588c15348223c) - Jan 28, 2020 +- Add dark theme + +## [[v3.2.5]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.2.5) - [1f87852](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/1f878525851ee30fb178c78062530cba49029df9) - Jan 28, 2020 +- Add dark theme + +## [[v3.2.4]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.2.4) - [c0641eb](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/c0641eb8b37869abe266a37b1d797b152905cf01) - Jan 28, 2020 +- Keep "Experimental conversions" switch state + +## [[v3.2.3]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.2.3) - [7e026b0](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/7e026b0556d459b254afd531ed17237ad1589455) - Jan 28, 2020 +- Keep "Experimental conversions" switch state + +## [[v3.2.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.2.2) - [96e99fd](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/96e99fd8d7d965277bfdbf7e2d7154642bfbdc09) - Jan 28, 2020 +- Offline usage + +## [[v3.2.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.2.1) - [c083e18](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/c083e18590e84c6aa0741f271567cc53a9c2420e) - Jan 28, 2020 +- Offline usage + +## [[v3.2.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.2.0) - [04d082c](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/04d082c91cf3121332f026743eefd3565ed31a6c) - Jan 28, 2020 +- Offline usage + +## [[v3.1.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.1.0) - [197838e](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/197838ed1dd3d2ad818a42464ade5cb6ba878fb7) - Jan 5, 2020 +- Possible speed up texture pack loading +- First sounds support +- Improve dialog ui (Experimental) +- More table icons (Experimental) + +## [[v3.0.4]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.0.4) - [d94e36b](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/d94e36bf816448383b7f573c0026cd8a7610156f) - Jan 2, 2020 +- Improve error handling + +## [[v3.0.3]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.0.3) - [9db1f83](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/9db1f83fa59421be1d59062b57ec78217ac5c25e) - Jan 2, 2020 +- Improve error handling + +## [[v3.0.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.0.2) - [3da35f6](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/3da35f6d6b9010607fd1b418e92eba53a691c00a) - Jan 2, 2020 +- Fix title + +## [[v3.0.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.0.1) - [b98f849](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/b98f849dddc28417da6649ff4dc8ec4def9d33fa) - Jan 2, 2020 +- Fix browser cache + +## [[v3.0.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v3.0.0) - [008afe1](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/008afe14177cc7eb71f5ad0df8bfe6754f43542c) - Jan 1, 2020 +- Most ui conversions are now experimental and need to enabled (if you want to try) +- Convert dialog and inventory ui (Experimental) +- Improve error handling +- Possible bugs fixed in: + - Fix crosshair + - Fix dye + - Fix enchanted item glint + - Fix grass block + - Fix sheep + +## [[v2.0.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v2.0.2) - [b78f341](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/b78f3418ee66d2243220feb6829410444b3211fa) - Dec 15, 2019 +- Support java v1.15 and bedrock v1.14 +- Convert hotbar, bars, buttons and tabs ui and inventory icons +- Possible bugs fixed in: + - Fix arrow entity + - Fix bed feeds + - Fix chest item + - Fix fireworks entity + - Fix fishing hook entity + - Fix lava block + - Fix opaque leaves block + - Fix piston arm entity + - Fix redstone dust block + - Fix title image + +## [[v1.13.5]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.13.5) - [b6080de](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/b6080de4fe037352ba301149a84de073711e734d) - Nov 20, 2019 +- Fixes + +## [[v1.13.3]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.13.3) - [5f6941e](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/5f6941ebb8a8f0c661ed208d02887bcee220a9c6) - Nov 16, 2019 +- Some gui and readme changes + +## [[v1.13.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.13.2) - [f6fdab8](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/f6fdab80eca519defc8c73e4701d8b0c3ad5516f) - Nov 15, 2019 +- Fix turtles + +## [[v1.13.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.13.1) - [3ec2a31](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/3ec2a31c1d687b25357ec81b78b4a4bc8c2b1af9) - Nov 11, 2019 +- Fix destroy stage + +## [[v1.13.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.13.0) - [baff654](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/baff6546cde7b011d00154adb47ef93ffca211af) - Nov 4, 2019 +- v1.13.0 + +## [[v1.12.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.12.1) - [304000a](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/304000a2935db3bfceeadd8b6fdebc58576c3ecf) - Oct 30, 2019 +- Fix pillager and ravager spawn eggs + +## [[v1.12.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.12.0) - [bc85850](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/bc858505db4b76436418f3c4cd3aeb4193514f46) - Oct 30, 2019 +- Add debug webapp +- Fix bedrock v1.13.x + +## [[v1.11.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.11.2) - [6c7b3e9](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/6c7b3e9cd7d671aa382f0cb96b78008149a9f75e) - Sep 25, 2019 +- Title image convert + +## [[v1.11.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.11.1) - [eaf5401](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/eaf5401f00ae3daa0f0c1efa061e4ac0cf386a77) - Sep 22, 2019 +- Search inventory icon + +## [[v1.11.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.11.0) - [497c98e](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/497c98efa78308bac9ce4f3cc9cf0384d1c61150) - Sep 22, 2019 +- Supports drag'n'drop + +## [[v1.10.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.10.1) - [9ff2020](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/9ff20200a39d4d03a7d72d7beb2ccca108b5b0ce) - Sep 12, 2019 +- Exclude webapp from npm package + +## [[v1.10.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.10.0) - [d96b09d](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/d96b09d4dd95d75b3375aa13a832c17e4c00906f) - Sep 1, 2019 +- Restruct code +- Optimized conversion popup +- Reimplement weather convert + +## [[v1.9.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.9.0) - [56d9639](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/56d9639659e53afa99fb24bddb2c97f1ad649e28) - Aug 27, 2019 +- Allow select folder on browser gui + +## [[v1.8.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.8.0) - [9e4a785](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/9e4a785c1468f2466e678fc847c720e522463ef4) - Aug 23, 2019 +- New GUI directly in your browser + +## [[v1.7.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.7.2) - [1182b61](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/1182b61dbec2dfa53433f28dbd1521a5d2c638b0) - Aug 22, 2019 +- Browser support +- `ArrayBuffer` and `Uint8Array` support + +## [[v1.7.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.7.1) - [c66ec33](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/c66ec3397c26f846f57264424eb598d5f8c0c543) - Aug 22, 2019 +- Better validate input + +## [[v1.7.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.7.0) - [126eee3](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/126eee39cd9de0395d1dc0b1afd50915b753bb12) - Aug 20, 2019 +- Supports input and output a `Buffer` +- Remove temp folder usage, instead write directly to the output +- Improved zip output again from v1.6.0 by using `jszip` now instead of `adm-zip` library + +## [[v1.6.5]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.6.5) - [5fafc0e](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/5fafc0ef86e60b2c9883b0d2503e673b54fcdf1f) - Aug 17, 2019 +- Fix painting are warped + +## [[v1.6.4]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.6.4) - [148fa5b](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/148fa5b90cd084dd864c06ec1ad20b58ec59d78e) - Aug 17, 2019 +- Fix parse `pack.mcmeta` files with 'UFT8-BOOM' + +## [[v1.6.3]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.6.3) - [d151784](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/d1517844f9cc12c9ae7bbda6f0558dc4c117561b) - Aug 15, 2019 +- Fix `publish` script + +## [[v1.6.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.6.2) - [04c1fab](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/04c1fab66e65c0d24a2960ebe9aa5c975d27baf8) - Aug 15, 2019 +- Keep old `assets` folder + +## [[v1.6.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.6.1) - [d90fee5](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/d90fee5f74b7a406defac952836b416a32c7dab4) - Aug 7, 2019 +- Fix + +## [[v1.6.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.6.0) - [ea62d78](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/ea62d78e4e9e1555e1a2d5336a7ed30a48ffa333) - Aug 7, 2019 +- Refactoring output zip + +## [[v1.5.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.5.0) - [0b0859d](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/0b0859dbc0071c2fa997feaf171ac8aa3ccfeced) - Jul 31, 2019 +- Convert fireworks +- Fix `EXDEV: cross-device link not permitted` + +## [[v1.4.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.4.2) - [151b27a](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/151b27aedcf6613f7f45be52235b5986b0f87b1d) - Jul 30, 2019 +- Update description + +## [[v1.4.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.4.1) - [ff3fe71](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/ff3fe71a4cb621383547c264964cbac41c350998) - Jul 29, 2019 +- Some more support for Java v1.13 + +## [[v1.4.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.4.0) - [932d855](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/932d85503730c54bc6cd40ac821768f19d02b6a1) - Jul 29, 2019 +- Some more support for Java v1.13 + +## [[v1.3.10]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.10) - [bfa3c63](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/bfa3c63f90a692f1b5c7290cc5dbcd5220604ce6) - Jul 20, 2019 +- Fix + +## [[v1.3.9]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.9) - [3a51bbe](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/3a51bbe57e496a891effa980949b8e2f8a58720b) - Jul 20, 2019 +- Fix + +## [[v1.3.8]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.8) - [631e4ae](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/631e4ae20eaa405c83cad34c6c0a6b36c6a07550) - Jul 20, 2019 +- Fix + +## [[v1.3.7]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.7) - [60c09cd](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/60c09cd9b690bc3c73b4ba532931368050fa7ad1) - Jul 20, 2019 +- Fix + +## [[v1.3.6]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.6) - [27476fb](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/27476fb1120e4db574f45550e239cdd7b3ec03a7) - Jul 20, 2019 +- Fix + +## [[v1.3.5]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.5) - [00dbddd](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/00dbddd91feee1a68c4108b87486145fac514def) - Jul 20, 2019 +- Improvents + +## [[v1.3.4]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.4) - [c2fb157](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/c2fb157b3efe0acc7dd83d31004ca6c054f7a560) - Jul 20, 2019 +- Readme + +## [[v1.3.3]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.3) - [014f20e](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/014f20e16b16a382aa70e03f8e50049f6e5f22e6) - Jul 20, 2019 +- Custom log callback + +## [[v1.3.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.2) - [3abbea7](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/3abbea76d9ba2c3d106f89a75b52068db2ef7616) - Jul 20, 2019 +- Custom log callback + +## [[v1.3.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.1) - [1705169](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/17051699038dc251ba1ae66d7c863cbd8d16dc43) - Jul 8, 2019 +- More real illager banner colors + +## [[v1.3.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.3.0) - [0ab84fa](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/0ab84fa6e97b88833c7ce12d90e6a00100efa06b) - Jul 7, 2019 +- Convert weather environment +- Convert illager banner +- Fixed bugs due previous version + +## [[v1.2.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.2.0) - [c8bbff0](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/c8bbff0b802430708adb6e79eebe021c8030cc22) - Jul 6, 2019 +- Convert paintings, particles, map icons and banners + +## [[v1.1.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.1.0) - [c26eb6c](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/c26eb6c9b0606a6b3655ea7d63d401457c354537) - Jul 5, 2019 +- First try to convert horse textures (Is very tricky and may buggy) + +## [[v1.0.12]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.0.12) - [afbeda9](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/afbeda918a3816c281c077b8a1f10b1d7344d2cf) - Jul 3, 2019 +- Replaced zip libraries + +## [[v1.0.11]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.0.11) - [41bad82](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/41bad8215f0ae22ff403f4d48f44e61aef583a74) - Jul 3, 2019 +- Updated readme + +## [[v1.0.10]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.0.10) - [e5253cd](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/e5253cdd2672f20697fc1e5753b818a43137bae4) - Jul 2, 2019 +- Missing `dist` folder + +## [[v1.0.9]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.0.9) - [2e3f05d](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/2e3f05d0317ba52bfe1685f10068f5b6b4ec7161) - Jul 2, 2019 +- Update readme + +## [[v1.0.8]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v1.0.8) - [b0d57ca](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/b0d57caf37084ca83d83b70ebdb3414b199d20ed) - Jul 2, 2019 +- May fix `bin` script \ No newline at end of file From 54d19602a8d98f7b2fec61361404b4550e276abb Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 4 Feb 2022 14:35:48 -0600 Subject: [PATCH 34/51] v4.3.0 --- CHANGELOG.md | 15 +++++++ package.json | 10 +++-- src/css/style.less | 55 +++++++++++++++++++++-- src/html/index.html | 107 +++++++++++++++++++++++++------------------- src/img/header.jpg | Bin 0 -> 5677 bytes src/js/images.js | 1 + src/js/index.mjs | 1 + webpack.config.js | 8 +++- 8 files changed, 142 insertions(+), 55 deletions(-) create mode 100644 src/img/header.jpg create mode 100644 src/js/images.js diff --git a/CHANGELOG.md b/CHANGELOG.md index b5b6634..9778f18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [[v4.3.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.3.0) - Lastest Commit - Feb 4, 2022 +- Reformated some files +- Fix all the packages with [API](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi) version [`v4.0.8`](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi/releases/tag/v4.0.8) +- Automated builds for `gh-pages` with [GitHub Actions](https://github.com/features/actions) +- Updated Readme and Source Footer Links +- Made mobile have a shorter name than desktop +- Created `src/js/images.js` for images for webpack +- Customized Stylesheet + - Added Header Image + - Added Margin around Drag and Drop Zone + - Colored Drag and Drop Zone + - Made Experimental conversions Label and Switch Green + - Added Bootstrap + - Make three columns for better mobile support + ## [[v4.2.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.2.0) - [a1c27d8](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/a1c27d888058f61bbb3e67170b5f9cb66e3b53a8) - Dec 10, 2020 - Weather converter are now experimental - Log current `pack_format` if incompatible diff --git a/package.json b/package.json index e5e253d..afda966 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", - "version": "4.2.1", + "version": "4.3.0", "description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs", "keywords": [ "Minecraft", @@ -21,9 +21,11 @@ "url": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/issues" }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", - "dependencies": {}, + "dependencies": { + "file-loader": "^6.2.0" + }, "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi#v4.0.8", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", @@ -51,4 +53,4 @@ "build": "node_modules/.bin/webpack --config webpack.config.js" }, "private": false -} +} \ No newline at end of file diff --git a/src/css/style.less b/src/css/style.less index 2985378..d820f2b 100644 --- a/src/css/style.less +++ b/src/css/style.less @@ -1,6 +1,7 @@ @import (less) "~materialize-css/dist/css/materialize.min.css"; -html, body { +html, +body { .white; .black-text; display: flex; @@ -51,8 +52,8 @@ footer { label { .yellow-text; - input[type=checkbox]:checked + .lever, - input[type=checkbox]:checked + .lever:after { + input[type="checkbox"]:checked + .lever, + input[type="checkbox"]:checked + .lever:after { .yellow; } @@ -83,7 +84,8 @@ footer { } @media (prefers-color-scheme: dark) { - html, body { + html, + body { .grey.darken-4; .white-text; } @@ -119,3 +121,48 @@ footer { .grey.darken-3; } } + +.mobileOnly { + display: none; +} + +.dekstopOnly { + display: block; +} + +@media (max-width: 768px) { + .mobileOnly { + display: block; + } + .dekstopOnly { + display: none; + } +} + +main { + background: #c78a73 !important; + margin: 25px; +} + +body { + background-color: #795548 !important; +} + +nav .nav-title { + margin: 0px 28px; +} + +nav.nav-extended { + background-image: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), + url("./../img/header.jpg"); + background-position: center; +} + +footer .switch label { + color: #4caf50 !important; +} + +footer .switch label input[type="checkbox"]:checked + .lever, +footer .switch label input[type="checkbox"]:checked + .lever:after { + background: #4caf50 !important; +} diff --git a/src/html/index.html b/src/html/index.html index ef45adb..c03b2cc 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -1,61 +1,76 @@ + - <%= require("./../../package").description %> + + <%= require("./../../package").description %> + + + -
- -
-
- Select  - - - -  or drag'n'drop -
- +
- + + \ No newline at end of file diff --git a/src/img/header.jpg b/src/img/header.jpg new file mode 100644 index 0000000000000000000000000000000000000000..450526b05a23e36f2d05ac82c3dc83c093fdaedf GIT binary patch literal 5677 zcmb7HXH-+|vfc?Hh9V?D5Re|J0SQH=_fDh;(u-6@iqerHML>E-iXt6BiUa|v3P=e> zFf>7=cY%*0MM2;O&-a~k)?N3{-8(C5GP9p|zcVY(JoBE7pUnbrO;rt500aU7>cks3 zn*@{qD1;PB3V}jNp%*SdVdQXfaxyYP_$4|9hD&tx^h_*VY)qF?%=Gl^0_-Sm z9zK3PMm9l=ATNfCmyh>+5zvJT7sz4cwB+QpyiD{=y#Md(tQ|nWfM=jY5)dZ53$3Q&@O05F^cPV_WOKjwMw z2U>aglk*uT23UU?1^VQVY!v{xXSc$BAGXoqm`Mg@w*6OfS=FxCzHC5)US$@8cv*ij z@*{+jy)!r)7;oOYZMs)F`eLoN8(%lGj-C&M`gWvYkCnL^vgZmvU21-*JQAanB9SZF z+(5&AaBn~_eqpPc)tPdMpry^IV@VbqZJYpddN1|7ek*L7TE2g{zxLG5+vn?%Ro0QE zE4=$9Mq)kjqNB|-*B>*qv+U8v`H@9YaFSA+RFYt+g(`~5l*f;C*59*P92-0sJ~(1* zY;HE!BYdhri>q)Q$Z7w0b9WL8np`tGN=QF?>B=Ua68q@X`u5b?#8FP{v9m;j`p0Lk z4SR?6i#qwPUPGwvZ*6rMKHnRQCtvMd=))`@x$)&$71Iq&@0P!kj&#A`$Ux>V!sOcIQBFcj!VQ93@E|i`bY^8T zKxb^O$Hio@CurtH%+2@tIw|9kqqhyyC4U_;x$OUxAedo0>rPx^6WkWZ4mq&z7z&)0 zJW*fr^Cz{VL#=TMxZ=P#_r6eHi6iipi`o4$13EI#i=LYX%x>{_fZE7+iOq90yjkQIwW(%$p2}<*OWq!+JPX0w-NpYT_p?!I78TU+K(l&^{0{ z&uu_v#v!tQ7I|DJh|qQ5l_w5f_xo~_`LS!WYYUhcaMyp0hclnhOcqIF36I*{hHC~c zGBxhka*aA9X6SxUB;Yf~-w zkwUyghCm?D|E3s-1P+GK3L|Lf*fAocqGCt|6ep2UFe1@Fq~N*eW6e!uz4j*ZC)Fop z!~FZ9CKXrOCY8q|Z&h4<-_%qR%)W@LwYj4Xf%^ z;)D6k3qyXXcd4tYt0jxxl>8q3J<2OJ3VXgGTSR2XeM6?Sh$5F1HYMM|sA7Md^kH6+ z?6ZV|w2bmj2cF&2XK4pGix1C>Wg~WSXt9SjkG7OF0|nXC(84Cs{W?o0g6K_~rXaRG zdbZrE6Vh-IUEMIwmSrT;`y|8CQj#U#e!0U6YGi7uY3zx>;Ph~2C zz81!Yi_rDiu`mWX%v|=)*?X9l8RVf6u(>EDVq`Dru0TjXaM^k1cm}AEnWP_zr4LLi zz2)-Oe?^ty7?EL{`j)blP~vA@4DVSMgndqkbc(1~t}Cqhh^4Xu7xP8iWEAsV)E$j8 zju#+Qi;AU;#odb+RL|uF>!6kf#6DsO z`n6i^3V3}Lbi);qFrqhHaa@-%jp)}G#&(LrRn*Jc(e3iT#=B?I|_v^I-`xbMI*Vl>(^fvNPWuoXr>bB>x z$aE!x(ywRs{F;7$iCOy7qkXA8}-^B>y@|ymjQ< zlm|`mMBKaKq!cI=(sx-~4sER6zH%8h>%KJoVrW>!W*T*!M|#}6X(9SlzI9<#3UT*V z#SO&6s?6}Vu~LVQ70LFc=?0&2hQ6z#s_Lvfvb(qkY?kO>lwU8=R%143>{K{E8%E@Q z4yI7o>1bc)xIqEhE;aaY*3>y2Xc-ztiKhk}+|Zp_<~@`!=x%i9uP zlNU}Sf=h3)3O+1cA%AkEECj0jZW|I{!ATkQU>5eXQI43j2%I<{L13gL5HQI`Vn+=5aT0GEG;WQo zOOsuH%&($e5(a~_hruK0VDQy_e+KLs5I(wLEjlv9d83WVgd@jJbmPgz8=aMM?~06S z{i*e3@pmUEkGVQNfJrFSK1Q9#!!^e`)Taik84r|Xd)(7^jc{)^*S;RSvEKBq&qxhQ zSJ3)}9{+N%x9M+Gbtcy-Q37;m#s z54jM(uLdKRKfU4LbJjP)c9^(u7O!Bn}g0o5Evw!FD09UsI!x4EL8#HrlVkmA8TU;F*|I(lU3INqvWrO&X~C3X@~v2RFxtg6h(nXAqE zNXCz}&8d!Nw(5kn1w32(^>;XNrx zGMXzY$pT3Z^DRPL%T>v{#5MdZwLV#ME&A<|?=`1qwQJ$`JO8DZ#1RwrUwR1w5O85@ zb`DG)jpqJ#<7BcsbUdnOQ++`79a#r3Tql637m*QyKMdP1cyw2$jiGVT07>q~F zF?MS~pChEeN)Sqw*UrkDDSjTC5(nXJ!_*3xJvgh1 zZ%G72S3c-s8wUI0SUd2Q>=)-I`$=}l^6oJI6CxlgZf?gjrce>ywu9NDrB<+jYG+$D zXZVpl&5aa$+NrT~E5IN}Fr!fQUgYY+3rS`CBwl$y6ox;kVPr{~y zUsR;=LMspme!(IVzYoC2cMsAh@1Ek&+kh8MeL@$5yt~}~Yy??c{alswmvWXhq9y~U3@d= z+|(^ib;)|Nt85!K%CszWsT7GL>m~h+3I0K$)1s>#lv^%|wKJ1XW%JPM3ZL#e6Rp*B4 z<-X_Wncd2%IUj-geRIFElDksUX5hu-!=R|&bvjGcehLeBTMF%7WO`U zkW%IrTt;zp&$LxYc_x$`sAz6qMkt~@PKnM#yL@sc84@a2}S zWByQGg{W^4Ekp!cmd^$IZ!GB#y>S`w@62v>7BSb+YeDTXc4qx*W)-D2L-A%5Tu($Y zM2K6f7#qPkstJZCw`F1(>E(!Q`g5KG&f75@q(fIQD7_ml{bP{#N3XPgtMqoav}?c_ zu-?P)QAadEn!Qb%^2ea`j;XZ%RtOPskRVI^xf?9==8$*a>U}NF`J?IYE2wTv8+AK2 z=neGkaqrk($4b}Gu9^-*-*@TbtzfII_s5^5e);q5|qD-x^Gf;Lq&E#DO%q}!A-ikn;eCau_dg5S1^ig0ne(3~W z38`$dG2U!eWY$*`T8%VSolpaN1rAsdSP%sPzT-Ae>%Y!=J}pad3uj|j_o(BW*$?YM zxv^13Ht5r3B=so_Nh&@NA+w1=-dzYleRF)}GbR)IQx+TKn%``u$+at?NDj^HWqrqD zwHi70*PFda0z6Wg(t&z$W;Iz|(bt}>=L6v#RpM^(cGCD4MO}Ol!8Io>e`EcH)wKILntZ`~u@fF^(qQ=;7`JVws2&+Ig8sN&lHfh{yZ$ zGFfwA^g@#4-STkTZGVb%K99in6BQtcY}MH>5qoVAKkB6DlLqSKx!x3)S%cKZ1niq} zLziYU_So{*_cH6Y`5|vx$qHN+XjjB7eCl_oGXnYrFvXoxRWFLj6jkhy;}PKqsSzc5 z-=^yaN3srCK0(4d)v_Cg`g9{@na$Uw;Hp29BTNhyW@sGL6IU017iw_9%wUgiahGx| z6-D%hUk?*zW24X;_{WlVl}yF!Vu~Uh1;Rp8j6wkCYGO+>uY@?cW;vZ>=o_! zDDP$vF=0O9C;|qP|8Kb=j$YQpWQlr%QAlbFk^hh0z_*i2#bVv_MQ{i-2V>IEE>yWo zmG>8!L6)k79;0z&T4F4I?GXv5Es8E6?Db6)b4hHuvL;^D&a*irNjNE5*sdoj+a&un z@jq;Jno9#bR}XTkv~ahnE)0W*@y{tO9Bvpkuzg<)DsAO80%5d}?y~5l9e7oM(HZbB zP~~)!-{z`+Xnp8g1|@BgwZ39*<n?G* zCpT!QM6M2l0JLY?5=AdGF1k+~KtgFi9?1auJ~W>#lS`~`HNV5XBaU;j z5zwvlFp|i-?GFDG!_D7ond;|xTQ4;tYX~xywIcXM!ZpgE6#(5a`i1_TWQgKctvlAN zzQp0$K;dc6g$EwG-G4fXo=@)tlX*Hgos#xbWWaMvMN6xjdo1nZDDcKv=&W!Ln%(f_ z;6<0ArnLKx%#@C|W;gg%;n|_RV#M57PZ{G-3g}{u zCaOtE;i#F9!iBbs<480}gDKyG=d0g=KWGZOZ&N z3&C^!g242+%@V#fG6Gy+(Brw{HJnX&rQ8NYIKZmzY`jp>ut6tQcrVyb#-%+YA+@%= zh$LrDl5b1yzo?Rm=|Me-)op?3HbPDGH<^T!OM75NM325g>{>tu=D=Gq= zvf6FT@!?nL$A60dbf;iX;GSbO9N#^NTtf6mn?$=I47@lSvR`}kWMwlBwiuzF>Jk@j(A9tSVd(2V3*(Ztml}NpM_o762e?naJUs0}O?z?v z>K4|K8k5Y%dQ?Cj`9mCRN7OiUq~`E@vE{ZX5>^`gGT(|{w|;57S8jsPo!EZA$VI-D z014Klv{<`4w(Ta&om3gFjn<885#LX@6u%j1->?v$y4VU52+$K}r1_q3)acf@*0uIT zB-7$+w?)H*_ln&ecPb>C>(xlse&AWB=YrR8+?PM7KPExkMF?Rl#w;Oq_1i|1NA>1F z-@9`&1V@&FX_;`-8SRwQE&Ww)3XMRKbO2~vOuc%0G883VBIp{2UB`r-$n;-@9;`QbRq90A;`oG`m&%v*w U`kH;K`Aw9V3qEGk$(>F74<`8+2LJ#7 literal 0 HcmV?d00001 diff --git a/src/js/images.js b/src/js/images.js new file mode 100644 index 0000000..c59573c --- /dev/null +++ b/src/js/images.js @@ -0,0 +1 @@ +import headerImage from './../img/header.jpg'; \ No newline at end of file diff --git a/src/js/index.mjs b/src/js/index.mjs index a6ff70c..fc485b0 100644 --- a/src/js/index.mjs +++ b/src/js/index.mjs @@ -3,6 +3,7 @@ import OfflinePluginRuntime from "offline-plugin/runtime"; import swal from "sweetalert"; import Worker from "./worker.js"; import "./../css/style.less"; +import Images from "./images.js"; document.addEventListener("DOMContentLoaded", () => { const toastMessage = document.getElementById("toastMessage"); diff --git a/webpack.config.js b/webpack.config.js index e5950d9..6b43941 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -30,7 +30,13 @@ module.exports = { options: { name: "[name].[contenthash].js" } - } + }, { + test: /\.(jpe?g|png|gif|svg)$/i, + loader: 'file-loader', + options: { + name: '[name].[ext]' + } + }, ] }, optimization: { From 1e81e53b6efd3a233e1a35dd874dc07dff28a3c4 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Tue, 8 Feb 2022 11:39:49 -0600 Subject: [PATCH 35/51] v4.3.1 --- .dockerignore | 7 ------- .gitignore | 3 ++- .npmignore | 7 ------- CHANGELOG.md | 8 +++++++- Dockerfile | 18 ------------------ package.json | 13 +++++++------ src/js/index.mjs | 4 ++-- src/js/worker.js | 2 +- update_gh-pages.sh | 16 ---------------- 9 files changed, 19 insertions(+), 59 deletions(-) delete mode 100755 .dockerignore delete mode 100755 .npmignore delete mode 100644 Dockerfile delete mode 100755 update_gh-pages.sh diff --git a/.dockerignore b/.dockerignore deleted file mode 100755 index 5555ffc..0000000 --- a/.dockerignore +++ /dev/null @@ -1,7 +0,0 @@ -.* -build -Dockerfile -node_modules -old -vendor -*-lock.json \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1b9ab99..a7f9c53 100755 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ old vendor *.lock *-lock.json -*.log \ No newline at end of file +*.log +.DS_STORE \ No newline at end of file diff --git a/.npmignore b/.npmignore deleted file mode 100755 index 5555ffc..0000000 --- a/.npmignore +++ /dev/null @@ -1,7 +0,0 @@ -.* -build -Dockerfile -node_modules -old -vendor -*-lock.json \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9778f18..539d683 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog -## [[v4.3.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.3.0) - Lastest Commit - Feb 4, 2022 +## [[v4.3.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.3.1) - Lastest Commit - Feb 8, 2022 +- Made my own fork of [convert-base-api](https://github.com/ModifiedCommand/convert-base-api) to fix the rename zip error in [issue 1](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/issues/1). +- Remove docker information +- Remove `update_gh-pages.sh` +- Fix Conversion Grammar + +## [[v4.3.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.3.0) - [54d1960](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/54d19602a8d98f7b2fec61361404b4550e276abb) - Feb 4, 2022 - Reformated some files - Fix all the packages with [API](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi) version [`v4.0.8`](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi/releases/tag/v4.0.8) - Automated builds for `gh-pages` with [GitHub Actions](https://github.com/features/actions) diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index fb9a3a3..0000000 --- a/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM node:14-alpine as build - -COPY . /src -WORKDIR /src - -ENV NODE_ENV development -RUN yarn - -ENV NODE_ENV production -RUN yarn build - -RUN cp -r build /build -WORKDIR /build -RUN rm -rf /src - -FROM httpd:alpine - -COPY --from=build /build /usr/local/apache2/htdocs diff --git a/package.json b/package.json index afda966..b2274a4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", - "version": "4.3.0", + "version": "4.3.1", "description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs", "keywords": [ "Minecraft", @@ -21,14 +21,12 @@ "url": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/issues" }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", - "dependencies": { - "file-loader": "^6.2.0" - }, "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.3", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", + "file-loader": "6.2.0", "file-saver": "https://github.com/eligrey/FileSaver.js/tarball/9a0a1e4ae2732c2d8eedc0214ef1c0fa32d15150", "html-webpack-plugin": "3.2.0", "less": "3.11.1", @@ -52,5 +50,8 @@ "scripts": { "build": "node_modules/.bin/webpack --config webpack.config.js" }, - "private": false + "private": false, + "dependencies": { + "@modifiedcommand/convert-base-api": "^1.0.8" + } } \ No newline at end of file diff --git a/src/js/index.mjs b/src/js/index.mjs index fc485b0..c1c2f34 100644 --- a/src/js/index.mjs +++ b/src/js/index.mjs @@ -175,7 +175,7 @@ document.addEventListener("DOMContentLoaded", () => { selectInputFileButton.value = selectInputFolderButton.value = ""; const savePopup = swal({ - title: "Conversion was successfully", + title: "Conversion was successful", content: logs, icon: "success", buttons: "Save" @@ -201,7 +201,7 @@ document.addEventListener("DOMContentLoaded", () => { selectInputFileButton.value = selectInputFolderButton.value = ""; swal({ - title: "Conversion was failed", + title: "Conversion failed", content: logs, icon: "error" }); diff --git a/src/js/worker.js b/src/js/worker.js index 1c3cfb1..684af73 100644 --- a/src/js/worker.js +++ b/src/js/worker.js @@ -1,4 +1,4 @@ -import { AbstractLog, ArrayInput, FileInputEntry, FileOutput } from "@geekcornernpm/convert-base-api"; +import { AbstractLog, ArrayInput, FileInputEntry, FileOutput } from "@modifiedcommand/convert-base-api"; import { ConvertJavaTextureToBedrockApi } from "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api"; addEventListener("message", async e => { diff --git a/update_gh-pages.sh b/update_gh-pages.sh deleted file mode 100755 index 491617c..0000000 --- a/update_gh-pages.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -cd ../webapp-gh-pages - -rm -rf $(ls -a -I '.' -I '..' -I '.git') - -docker pull modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp - -docker run -d --name convert-minecraft-java-texture-to-bedrock-webapp modifiedcommand/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 From 34c1fa1c6a38957b5c649345b7089e112102fa71 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Tue, 8 Feb 2022 17:49:51 -0600 Subject: [PATCH 36/51] Possible Two Type Download? --- src/js/index.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/index.mjs b/src/js/index.mjs index c1c2f34..bf841aa 100644 --- a/src/js/index.mjs +++ b/src/js/index.mjs @@ -178,6 +178,7 @@ document.addEventListener("DOMContentLoaded", () => { title: "Conversion was successful", content: logs, icon: "success", + //buttons: ["zip", "mcpack"] buttons: "Save" }); From e9e61a5371cad20a4b0bf7e73c988aa32d0ba77e Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Tue, 8 Feb 2022 17:50:02 -0600 Subject: [PATCH 37/51] Experimental Default Enable --- src/html/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/html/index.html b/src/html/index.html index c03b2cc..4c6e7c7 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -43,7 +43,7 @@
From 36c7b823fb35b842cc2ae447a683d5840a0dda50 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Tue, 8 Feb 2022 17:50:07 -0600 Subject: [PATCH 38/51] v4.3.2 --- CHANGELOG.md | 7 ++++++- package.json | 9 +++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 539d683..8d1e465 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog -## [[v4.3.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.3.1) - Lastest Commit - Feb 8, 2022 +## [[v4.3.2]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.3.2) - Lastest Commit - Feb 8, 2022 +- Convert Base API version updated to [`v1.0.10`](https://github.com/ModifiedCommand/convert-base-api/releases/tag/v1.0.10) +- Convert Java Texture To Bedrock API updated to [`v4.1.5`](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi/releases/tag/v4.1.5) +- Fixed files and folder not converting at all. + +## [[v4.3.1]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.3.1) - [1e81e53](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/1e81e53b6efd3a233e1a35dd874dc07dff28a3c4) - Feb 8, 2022 - Made my own fork of [convert-base-api](https://github.com/ModifiedCommand/convert-base-api) to fix the rename zip error in [issue 1](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/issues/1). - Remove docker information - Remove `update_gh-pages.sh` diff --git a/package.json b/package.json index b2274a4..3096d9b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", - "version": "4.3.1", + "version": "4.3.2", "description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs", "keywords": [ "Minecraft", @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.3", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.5", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", @@ -50,8 +50,5 @@ "scripts": { "build": "node_modules/.bin/webpack --config webpack.config.js" }, - "private": false, - "dependencies": { - "@modifiedcommand/convert-base-api": "^1.0.8" - } + "private": false } \ No newline at end of file From 562ea270dd0e7e8b6375b0d16239fe7bb0908c1b Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Tue, 8 Feb 2022 17:55:14 -0600 Subject: [PATCH 39/51] Update README.md --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index 966f3ae..bab0098 100644 --- a/README.md +++ b/README.md @@ -60,16 +60,5 @@ Internet Explorer or old Edge are not supported! ## Web app * The latest version is available through [GitHub pages](http://modifiedcommand.github.io/ConvertJavaTextureToBedrock/) -### Docker - -You can also use the web app with Docker like - -```bash -docker pull ozelot379/convert-minecraft-java-texture-to-bedrock-webapp -docker run --rm -p 127.0.0.1:8080:80 ozelot379/convert-minecraft-java-texture-to-bedrock-webapp -``` - -Look at https://hub.docker.com/r/ozelot379/convert-minecraft-java-texture-to-bedrock-webapp - ## API * Look at [ModifiedCommand/ConvertJavaTextureToBedrockApi](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi) From 5284a68915018964d75880f41682b587828d77ff Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Thu, 10 Feb 2022 15:19:41 -0600 Subject: [PATCH 40/51] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3096d9b..8f9a07e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", "version": "4.3.2", - "description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs", + "description": "Convert a Java Texture Pack to Bedrock Texture Pack", "keywords": [ "Minecraft", "Texture", @@ -51,4 +51,4 @@ "build": "node_modules/.bin/webpack --config webpack.config.js" }, "private": false -} \ No newline at end of file +} From 1a61de7b20b2bfadb7fbe3710561d058bd6865c0 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Sat, 23 Jul 2022 02:04:00 -0500 Subject: [PATCH 41/51] API update to 4.1.7 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8f9a07e..54838a4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", - "version": "4.3.2", + "version": "4.3.3", "description": "Convert a Java Texture Pack to Bedrock Texture Pack", "keywords": [ "Minecraft", @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.5", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.7", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", From c1d44e51db74036269bd8007236de665d1632ca3 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Tue, 21 Mar 2023 19:11:12 -0500 Subject: [PATCH 42/51] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 519508d..bda23e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: gh-build on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: From a0193ec3fb9126bf85a7baa930bc3890f96ab218 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Tue, 21 Mar 2023 23:02:55 -0500 Subject: [PATCH 43/51] Update build.yml --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bda23e2..a0ee91d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,11 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Use Node.js 14.x + uses: actions/setup-node@v3 + with: + node-version: 14.x + - name: Build run: | yarn install From ae59b2fb0f5e00bef8267958eac2838151ce3990 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:32:59 -0600 Subject: [PATCH 44/51] API update to 4.1.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54838a4..ece289f 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.7", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.8", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", From e15ae7de3c58b9027158a5cf578044fefc91e3a0 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:33:40 -0600 Subject: [PATCH 45/51] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 6d5bbd374cc7cd70b36c6638fa1724d5cf13976e Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Mon, 4 Dec 2023 16:08:47 -0600 Subject: [PATCH 46/51] API update to 4.1.8 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ece289f..4f84ef9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", - "version": "4.3.3", + "version": "4.3.4", "description": "Convert a Java Texture Pack to Bedrock Texture Pack", "keywords": [ "Minecraft", @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.8", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.9", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", From b3f9fde620d3776cd846c0752cc713ad6e237919 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Mon, 4 Dec 2023 16:11:47 -0600 Subject: [PATCH 47/51] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0ee91d..dd7242a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js 14.x uses: actions/setup-node@v3 From b961f0c0c6f5ffbd10c5df4b7af0d38bc18a0d07 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Mon, 4 Dec 2023 16:13:37 -0600 Subject: [PATCH 48/51] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f84ef9..ca55dca 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.9", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.8", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", From 142a07371c172d97d55046973f1bbdc52143b1f1 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Mon, 15 Apr 2024 09:19:59 -0400 Subject: [PATCH 49/51] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ca55dca..d16ed7e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", - "version": "4.3.4", + "version": "4.3.5", "description": "Convert a Java Texture Pack to Bedrock Texture Pack", "keywords": [ "Minecraft", @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.8", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.9", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", From cf1b26a8c27811facbc99e4bd1d12a81e5b9bf73 Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Mon, 15 Apr 2024 08:24:31 -0500 Subject: [PATCH 50/51] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d16ed7e..4370676 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.9", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.10", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2", From fc1739b68c28c3a9e946075c8162deee563b0dfd Mon Sep 17 00:00:00 2001 From: PiSaucer <33438654+PiSaucer@users.noreply.github.com> Date: Fri, 3 May 2024 19:57:54 -0500 Subject: [PATCH 51/51] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4370676..14565de 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp", "productName": "ConvertJavaTextureToBedrockWebApp", - "version": "4.3.5", + "version": "4.3.6", "description": "Convert a Java Texture Pack to Bedrock Texture Pack", "keywords": [ "Minecraft", @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme", "devDependencies": { - "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.10", + "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "4.1.11", "clean-webpack-plugin": "3.0.0", "css-loader": "3.4.2", "favicons-webpack-plugin": "1.0.2",