Merge branch 'develop' into 'master'

Fix conduit textures See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!49
ModifiedCommand · Jun 21, 2020 · 9d724cc · 9d724cc
2 parents b59d942 + 0f7dcd8
commit 9d724cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [3.5.1]
+- Fix conduit textures
+
 ## [3.5.0]
 - Convert dolphin texture
 

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