Skip to content

Commit a1c27d8

Browse files
author
ozelot379
committed
Merge branch 'develop' into 'master'
Develop See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!57
2 parents 554769d + 4c12083 commit a1c27d8

9 files changed

Lines changed: 47 additions & 21 deletions

File tree

‎.dockerignore‎

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

‎.github/ISSUE_TEMPLATE/issue.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ assignees: ''
88
---
99

1010
**Describe the issue**
11-
Please consult the readme before you report an issue
11+
Please consult the readme and other issues before you report an issue
1212

1313
A clear and concise description of what the issue is.
1414

‎.gitignore‎

100644100755
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
.idea
2+
.npmrc
23
build
34
node_modules
5+
old
6+
vendor
47
*.lock
58
*-lock.json
69
*.log

‎.npmignore‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
.idea
1+
.*
22
build
3+
Dockerfile
34
node_modules
4-
*.lock
5-
*-lock.json
6-
*.log
5+
old
6+
vendor
7+
*-lock.json

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## [4.2.0]
4+
- Weather converter are now experimental
5+
- Log current `pack_format` if incompatible
6+
37
## [4.1.0]
48
- Bedrock manifest format version 2
59
- Convert java mcmeta description array

‎README.md‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
THIS PROJECT IS NO OFFICIAL MINECRAFT PRODUCT - NOT AUTHORIZED OR ASSOCIATED BY MOJANG
1+
NOT OFFICIAL MINECRAFT PRODUCT. NOT APPROVED BY OR ASSOCIATED WITH MOJANG
22

33
---
44

5-
# Web app for convert Minecraft Java texture packs to Bedrock texture packs
5+
# Web app for converting Minecraft Java texture packs to Bedrock texture packs
66

77
## Description
88

@@ -20,8 +20,9 @@ It supports to convert blocks, items, entities, paintings, particles, map icons,
2020
Please note:
2121

2222
- No guarantee it will work
23-
- Please notice your browser is be supported
2423
- Each texture pack could be different and may not work or only partially
24+
- Please notice your browser is be supported
25+
- Works directly in your browser - no upload required and offline usage
2526
- Some conversions of HD texture packs may takes a while
2627
- You need a device with corresponding enough RAM (like the file size and content of the texture pack), because the convert it is not stored in a temporary storage, but in the RAM memory
2728
- Shaders or OptiFine or 3d textures or mods or datapacks or custom models or fonts are not supported, only classic Vanilla textures
@@ -32,12 +33,14 @@ Please note:
3233
- Please don't report Java or Bedrock version changes
3334

3435
Some experimental conversions are disabled by default, but can be enabled if you want to try, but please be warned, it contains many bugs and may are not beautiful and may not usable:
36+
- Horses
3537
- UI
3638
- Buttons
3739
- Tabs
3840
- Dialogs
3941
- Inventory / Recipe book
4042
- Crafting tables
43+
- Weather (Rain/Snow)
4144

4245
## Requirements
4346

@@ -78,7 +81,3 @@ Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockCli
7881
## API
7982

8083
Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockApi
81-
82-
## Report issue
83-
84-
Use github repo issues (https://github.com/ozelot379/ConvertJavaTextureToBedrock/issues/new/choose)

‎package.json‎

Lines changed: 3 additions & 3 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": "ConvertJavaTextureToBedrockWebApp",
4-
"version": "4.1.0",
5-
"description": "Web app for convert Minecraft Java texture packs to Bedrock texture packs",
4+
"version": "4.2.0",
5+
"description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs",
66
"keywords": [
77
"Minecraft",
88
"Texture",
@@ -23,7 +23,7 @@
2323
"homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
2424
"dependencies": {},
2525
"devDependencies": {
26-
"@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "4.1.0",
26+
"@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "4.2.0",
2727
"clean-webpack-plugin": "3.0.0",
2828
"css-loader": "3.4.2",
2929
"favicons-webpack-plugin": "1.0.2",

‎src/html/index.html‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
<div class="container">
3535
<div class="row">
3636
<div class="col l6">
37-
<div>Works directly in your browser - no upload and offline</div>
37+
<div>Works directly in your browser - no upload required and offline usage</div>
3838
<div>More infos in the <a class="green-text"
3939
href="https://github.com/ozelot379/ConvertJavaTextureToBedrock/blob/master/README.md"
4040
target="_blank">Readme</a></div>
4141
</div>
4242
<div class="col l6">
4343
<div>
44-
THIS PROJECT IS NO OFFICIAL MINECRAFT PRODUCT - NOT AUTHORIZED OR ASSOCIATED BY MOJANG
44+
NOT OFFICIAL MINECRAFT PRODUCT. NOT APPROVED BY OR ASSOCIATED WITH MOJANG
4545
</div>
4646
<div>&nbsp;</div>
4747
<div>
@@ -50,10 +50,6 @@
5050
<div>
5151
<a class="green-text" href="https://github.com/ozelot379/ConvertJavaTextureToBedrock"
5252
target="_blank">Source</a>
53-
&nbsp;-&nbsp;
54-
<a class="green-text"
55-
href="https://github.com/ozelot379/ConvertJavaTextureToBedrock/issues/new/choose"
56-
target="_blank">Report issue</a>
5753
</div>
5854
</div>
5955
</div>

‎update_gh-pages.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
cd ../webapp-gh-pages
3+
4+
rm -rf $(ls -a -I '.' -I '..' -I '.git')
5+
6+
docker pull ozelot379/convert-minecraft-java-texture-to-bedrock-webapp
7+
8+
docker run -d --name convert-minecraft-java-texture-to-bedrock-webapp ozelot379/convert-minecraft-java-texture-to-bedrock-webapp
9+
10+
docker cp convert-minecraft-java-texture-to-bedrock-webapp:/usr/local/apache2/htdocs/ ./
11+
12+
docker container rm convert-minecraft-java-texture-to-bedrock-webapp -f
13+
14+
cp -r htdocs/* .
15+
16+
rm -rf htdocs

0 commit comments

Comments
 (0)