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