Merge remote-tracking branch 'origin/master'

2020-09-24 18:04:17 +03:00 · 2020-09-24 18:04:17 +03:00 · 34e7c442e4
commit 34e7c442e4
parent 911fa8ee6d bf93adbf03
7 changed files with 6 additions and 0 deletions
--- a/psd/end_stone_smelter.psd
+++ b/psd/end_stone_smelter.psd
--- a/psd/end_stone_smelter_on.psd
+++ b/psd/end_stone_smelter_on.psd
--- a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front.png
+++ b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front.png
--- a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png
+++ b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png
--- a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png.mcmeta
+++ b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png.mcmeta
@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_side.png
+++ b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_side.png
--- a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_top.png
+++ b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_top.png