Skip to content

Commit a44aecc

Browse files
author
ozelot379
committed
Merge branch 'develop' into 'master'
Develop See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!45
2 parents 9e3e98b + 10a94d0 commit a44aecc

6 files changed

Lines changed: 43 additions & 6988 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.idea
22
build
33
node_modules
4+
*.lock
5+
*-lock.json
46
*.log

‎.npmignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.idea
2+
build
3+
node_modules
4+
*.lock
5+
*-lock.json
6+
*.log

‎README.md‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ THIS PROJECT IS NO OFFICIAL MINECRAFT PRODUCT - NOT AUTHORIZED OR ASSOCIATED BY
55
# Convert Minecraft Java texture packs to Bedrock texture packs
66

77
## Description
8+
89
It supports the follow Minecraft versions:
910

1011
| Minecraft | Version |
@@ -36,10 +37,9 @@ Some experimental conversions are disabled by default, but can be enabled if you
3637
- Inventory / Recipe book
3738
- Crafting tables
3839

39-
## Web app
40-
Look at https://ozelot379.github.io/ConvertJavaTextureToBedrock
40+
## Requirements
4141

42-
Works in a current browser.
42+
Works in a current browser
4343

4444
Tested browsers:
4545
- Desktop:
@@ -52,11 +52,18 @@ Tested browsers:
5252

5353
Internet Explorer or old Edge are not supported!
5454

55+
## Web app
56+
57+
Look at https://ozelot379.github.io/ConvertJavaTextureToBedrock
58+
5559
## CLI
60+
5661
Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockCli
5762

5863
## API
64+
5965
Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockApi
6066

6167
## Report issue
68+
6269
Use github repo issues (https://github.com/ozelot379/ConvertJavaTextureToBedrock/issues/new/choose)

‎package.json‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
33
"productName": "ConvertJavaTextureToBedrock",
4-
"version": "3.3.4",
5-
"description": "Convert Minecraft Java texture packs to Bedrock texture packs",
4+
"version": "3.4.0",
5+
"description": "Web app for convert Minecraft Java texture packs to Bedrock texture packs",
66
"keywords": [
77
"Minecraft",
88
"Texture",
@@ -23,28 +23,31 @@
2323
"homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
2424
"dependencies": {},
2525
"devDependencies": {
26-
"@ozelot379/convert-minecraft-java-texture-to-bedrock": "3.3.4",
27-
"clean-webpack-plugin": "^3.0.0",
28-
"css-loader": "^3.2.0",
29-
"favicons-webpack-plugin": "^1.0.1",
26+
"@ozelot379/convert-minecraft-java-texture-to-bedrock": "3.4.0",
27+
"clean-webpack-plugin": "3.0.0",
28+
"css-loader": "3.4.2",
29+
"favicons-webpack-plugin": "1.0.2",
3030
"file-saver": "https://github.com/eligrey/FileSaver.js/tarball/9a0a1e4ae2732c2d8eedc0214ef1c0fa32d15150",
31-
"gh-pages": "^2.1.1",
32-
"html-webpack-plugin": "^3.2.0",
33-
"less": "^3.10.3",
34-
"less-loader": "^5.0.0",
35-
"materialize-css": "^1.0.0",
36-
"mini-css-extract-plugin": "^0.8.0",
37-
"offline-plugin": "^5.0.7",
38-
"optimize-css-assets-webpack-plugin": "^5.0.3",
39-
"path-browserify": "^1.0.0",
40-
"sweetalert": "^2.1.2",
41-
"webpack": "^4.39.2",
42-
"webpack-cli": "^3.3.7",
43-
"webpack-dev-server": "^3.8.2",
44-
"worker-loader": "^2.0.0"
31+
"gh-pages": "2.2.0",
32+
"html-webpack-plugin": "3.2.0",
33+
"less": "3.11.1",
34+
"less-loader": "5.0.0",
35+
"materialize-css": "1.0.0",
36+
"mini-css-extract-plugin": "0.8.2",
37+
"offline-plugin": "5.0.7",
38+
"optimize-css-assets-webpack-plugin": "5.0.3",
39+
"path-browserify": "1.0.1",
40+
"sweetalert": "2.1.2",
41+
"webpack": "4.42.0",
42+
"webpack-cli": "3.3.11",
43+
"webpack-dev-server": "3.10.3",
44+
"worker-loader": "2.0.0"
45+
},
46+
"resolutions": {
47+
"sharp": "0.25.3"
4548
},
4649
"engines": {
47-
"node": ">=12.0.0"
50+
"node": ">=14.0.0"
4851
},
4952
"scripts": {
5053
"build": "webpack",

‎src/js/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import fileSaver from "file-saver";
22
import OfflinePluginRuntime from "offline-plugin/runtime";
33
import swal from "sweetalert";
4-
import Worker from "./worker";
4+
import Worker from "./worker.js";
55
import "./../css/style.less";
66

77
document.addEventListener("DOMContentLoaded", () => {

0 commit comments

Comments
 (0)