Merge and fix

2020-11-08 15:07:19 +03:00 · 2020-11-08 15:07:19 +03:00 · ce9f4add97
commit ce9f4add97
parent b91c85529d
548 changed files with 17517 additions and 16862 deletions
--- a/src/main/resources/assets/betterend/textures/block/andesite_lantern_bottom.png
+++ b/src/main/resources/assets/betterend/textures/block/andesite_lantern_bottom.png
--- a/src/main/resources/assets/betterend/textures/block/andesite_lantern_side.png
+++ b/src/main/resources/assets/betterend/textures/block/andesite_lantern_side.png
--- a/src/main/resources/assets/betterend/textures/block/andesite_lantern_top.png
+++ b/src/main/resources/assets/betterend/textures/block/andesite_lantern_top.png
--- a/src/main/resources/assets/betterend/textures/block/blackstone_lantern_bottom.png
+++ b/src/main/resources/assets/betterend/textures/block/blackstone_lantern_bottom.png
--- a/src/main/resources/assets/betterend/textures/block/blackstone_lantern_side.png
+++ b/src/main/resources/assets/betterend/textures/block/blackstone_lantern_side.png
--- a/src/main/resources/assets/betterend/textures/block/blackstone_lantern_top.png
+++ b/src/main/resources/assets/betterend/textures/block/blackstone_lantern_top.png
--- a/src/main/resources/assets/betterend/textures/block/diorite_lantern_bottom.png
+++ b/src/main/resources/assets/betterend/textures/block/diorite_lantern_bottom.png
--- a/src/main/resources/assets/betterend/textures/block/diorite_lantern_side.png
+++ b/src/main/resources/assets/betterend/textures/block/diorite_lantern_side.png
--- a/src/main/resources/assets/betterend/textures/block/diorite_lantern_top.png
+++ b/src/main/resources/assets/betterend/textures/block/diorite_lantern_top.png
--- a/src/main/resources/assets/betterend/textures/block/end_portal.png.mcmeta
+++ b/src/main/resources/assets/betterend/textures/block/end_portal.png.mcmeta
@ -1,6 +1,6 @@
-{
-  "animation": {
-    "interpolate": true,
-    "frametime": 4
-  }
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 4
+  }
 }
--- a/src/main/resources/assets/betterend/textures/block/end_stone_lantern_bottom.png
+++ b/src/main/resources/assets/betterend/textures/block/end_stone_lantern_bottom.png
--- a/src/main/resources/assets/betterend/textures/block/end_stone_lantern_side.png
+++ b/src/main/resources/assets/betterend/textures/block/end_stone_lantern_side.png
--- a/src/main/resources/assets/betterend/textures/block/end_stone_lantern_top.png
+++ b/src/main/resources/assets/betterend/textures/block/end_stone_lantern_top.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
@ -1,12 +1,12 @@
-{
-  "animation": {
-    "interpolate": true,
-    "frametime": 8,
-    "frames": [
-      0,
-      1,
-      2,
-      3
-    ]
-  }
-}
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 8,
+    "frames": [
+      0,
+      1,
+      2,
+      3
+    ]
+  }
+}
--- a/src/main/resources/assets/betterend/textures/block/flavolite_lantern_bottom.png
+++ b/src/main/resources/assets/betterend/textures/block/flavolite_lantern_bottom.png
--- a/src/main/resources/assets/betterend/textures/block/flavolite_lantern_side.png
+++ b/src/main/resources/assets/betterend/textures/block/flavolite_lantern_side.png
--- a/src/main/resources/assets/betterend/textures/block/flavolite_lantern_top.png
+++ b/src/main/resources/assets/betterend/textures/block/flavolite_lantern_top.png
--- a/src/main/resources/assets/betterend/textures/block/granite_lantern_bottom.png
+++ b/src/main/resources/assets/betterend/textures/block/granite_lantern_bottom.png
--- a/src/main/resources/assets/betterend/textures/block/granite_lantern_side.png
+++ b/src/main/resources/assets/betterend/textures/block/granite_lantern_side.png
--- a/src/main/resources/assets/betterend/textures/block/granite_lantern_top.png
+++ b/src/main/resources/assets/betterend/textures/block/granite_lantern_top.png
--- a/src/main/resources/assets/betterend/textures/block/purpur_lantern_bottom.png
+++ b/src/main/resources/assets/betterend/textures/block/purpur_lantern_bottom.png
--- a/src/main/resources/assets/betterend/textures/block/purpur_lantern_side.png
+++ b/src/main/resources/assets/betterend/textures/block/purpur_lantern_side.png
--- a/src/main/resources/assets/betterend/textures/block/purpur_lantern_top.png
+++ b/src/main/resources/assets/betterend/textures/block/purpur_lantern_top.png
--- a/src/main/resources/assets/betterend/textures/block/quartz_lantern_bottom.png
+++ b/src/main/resources/assets/betterend/textures/block/quartz_lantern_bottom.png
--- a/src/main/resources/assets/betterend/textures/block/quartz_lantern_side.png
+++ b/src/main/resources/assets/betterend/textures/block/quartz_lantern_side.png
--- a/src/main/resources/assets/betterend/textures/block/quartz_lantern_top.png
+++ b/src/main/resources/assets/betterend/textures/block/quartz_lantern_top.png
--- a/src/main/resources/assets/betterend/textures/block/violecite_lantern_bottom.png
+++ b/src/main/resources/assets/betterend/textures/block/violecite_lantern_bottom.png
--- a/src/main/resources/assets/betterend/textures/block/violecite_lantern_side.png
+++ b/src/main/resources/assets/betterend/textures/block/violecite_lantern_side.png
--- a/src/main/resources/assets/betterend/textures/block/violecite_lantern_top.png
+++ b/src/main/resources/assets/betterend/textures/block/violecite_lantern_top.png
--- a/src/main/resources/assets/betterend/textures/entity/shadow_walker.png
+++ b/src/main/resources/assets/betterend/textures/entity/shadow_walker.png