Merge branch 'Jappa-1.18.1' into Jappa-1.19

2026-04-17 08:46:58 -04:00 · 2022-02-19 22:12:03 +01:00
parent d9f2954bbc 64f2a0b55b
commit b9294b7c91
49 changed files with 113 additions and 3 deletions
--- a/assets/minecraft/optifine/ctm/red_sandstone/red_sandstone.properties
+++ b/assets/minecraft/optifine/ctm/red_sandstone/red_sandstone.properties
@@ -1,4 +1,4 @@
-matchBlocks=red_sandstone
+matchTiles=red_sandstone
 tiles=0-3
 faces=sides
 method=vertical
--- a/assets/minecraft/optifine/ctm/sandstone/sandstone.properties
+++ b/assets/minecraft/optifine/ctm/sandstone/sandstone.properties
@@ -1,4 +1,4 @@
-matchBlocks=sandstone
+matchTiles=sandstone
 tiles=0-3
 faces=sides
 method=vertical
--- a/assets/minecraft/textures/block/campfire_fire.png.mcmeta
+++ b/assets/minecraft/textures/block/campfire_fire.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
--- a/assets/minecraft/textures/block/crimson_stem.png.mcmeta
+++ b/assets/minecraft/textures/block/crimson_stem.png.mcmeta
@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/assets/minecraft/textures/block/kelp.png.mcmeta
+++ b/assets/minecraft/textures/block/kelp.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
--- a/assets/minecraft/textures/block/kelp_plant.png.mcmeta
+++ b/assets/minecraft/textures/block/kelp_plant.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
--- a/assets/minecraft/textures/block/seagrass.png.mcmeta
+++ b/assets/minecraft/textures/block/seagrass.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 2
+    }
+}
--- a/assets/minecraft/textures/block/tall_seagrass_bottom.png.mcmeta
+++ b/assets/minecraft/textures/block/tall_seagrass_bottom.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 2
+    }
+}
--- a/assets/minecraft/textures/block/tall_seagrass_top.png.mcmeta
+++ b/assets/minecraft/textures/block/tall_seagrass_top.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 2
+    }
+}
--- a/assets/minecraft/textures/block/warped_stem.png.mcmeta
+++ b/assets/minecraft/textures/block/warped_stem.png.mcmeta
@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/assets/minecraft/textures/block/water_flow.png.mcmeta
+++ b/assets/minecraft/textures/block/water_flow.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
--- a/assets/minecraft/textures/block/water_still.png.mcmeta
+++ b/assets/minecraft/textures/block/water_still.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
--- a/assets/minecraft/textures/entity/armorstand/wood.png
+++ b/assets/minecraft/textures/entity/armorstand/wood.png
--- a/assets/minecraft/textures/entity/goat/goat.png
+++ b/assets/minecraft/textures/entity/goat/goat.png
--- a/assets/minecraft/textures/entity/horse/donkey.png
+++ b/assets/minecraft/textures/entity/horse/donkey.png
--- a/assets/minecraft/textures/entity/horse/horse_skeleton.png
+++ b/assets/minecraft/textures/entity/horse/horse_skeleton.png
--- a/assets/minecraft/textures/entity/horse/horse_zombie.png
+++ b/assets/minecraft/textures/entity/horse/horse_zombie.png
--- a/assets/minecraft/textures/entity/horse/mule.png
+++ b/assets/minecraft/textures/entity/horse/mule.png
--- a/assets/minecraft/textures/entity/llama/brown.png
+++ b/assets/minecraft/textures/entity/llama/brown.png
--- a/assets/minecraft/textures/entity/llama/decor/cyan.png
+++ b/assets/minecraft/textures/entity/llama/decor/cyan.png
--- a/assets/minecraft/textures/entity/llama/decor/white.png
+++ b/assets/minecraft/textures/entity/llama/decor/white.png
--- a/assets/minecraft/textures/entity/llama/decor/yellow.png
+++ b/assets/minecraft/textures/entity/llama/decor/yellow.png
--- a/assets/minecraft/textures/entity/strider/strider.png
+++ b/assets/minecraft/textures/entity/strider/strider.png
--- a/assets/minecraft/textures/entity/strider/strider_cold.png
+++ b/assets/minecraft/textures/entity/strider/strider_cold.png
--- a/assets/minecraft/textures/entity/trident_riptide.png
+++ b/assets/minecraft/textures/entity/trident_riptide.png
--- a/assets/minecraft/textures/entity/villager/profession/butcher.png.mcmeta
+++ b/assets/minecraft/textures/entity/villager/profession/butcher.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "partial"
+    }
+}
--- a/assets/minecraft/textures/entity/villager/profession/farmer.png.mcmeta
+++ b/assets/minecraft/textures/entity/villager/profession/farmer.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/entity/villager/profession/fisherman.png.mcmeta
+++ b/assets/minecraft/textures/entity/villager/profession/fisherman.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/entity/villager/profession/fletcher.png.mcmeta
+++ b/assets/minecraft/textures/entity/villager/profession/fletcher.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/entity/villager/profession/librarian.png.mcmeta
+++ b/assets/minecraft/textures/entity/villager/profession/librarian.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/entity/villager/profession/shepherd.png.mcmeta
+++ b/assets/minecraft/textures/entity/villager/profession/shepherd.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/entity/zombie_villager/profession/butcher.png.mcmeta
+++ b/assets/minecraft/textures/entity/zombie_villager/profession/butcher.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "partial"
+    }
+}
--- a/assets/minecraft/textures/entity/zombie_villager/profession/farmer.png.mcmeta
+++ b/assets/minecraft/textures/entity/zombie_villager/profession/farmer.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/entity/zombie_villager/profession/fisherman.png.mcmeta
+++ b/assets/minecraft/textures/entity/zombie_villager/profession/fisherman.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png.mcmeta
+++ b/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png.mcmeta
+++ b/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/entity/zombie_villager/profession/shepherd.png.mcmeta
+++ b/assets/minecraft/textures/entity/zombie_villager/profession/shepherd.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "villager": {
+        "hat": "full"
+    }
+}
--- a/assets/minecraft/textures/gui/container/stats_icons.png
+++ b/assets/minecraft/textures/gui/container/stats_icons.png
--- a/assets/minecraft/textures/gui/spectator_widgets.png
+++ b/assets/minecraft/textures/gui/spectator_widgets.png
--- a/assets/minecraft/textures/gui/title/background/panorama_0.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_0.png
--- a/assets/minecraft/textures/gui/title/background/panorama_1.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_1.png
--- a/assets/minecraft/textures/gui/title/background/panorama_2.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_2.png
--- a/assets/minecraft/textures/gui/title/background/panorama_3.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_3.png
--- a/assets/minecraft/textures/gui/title/background/panorama_4.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_4.png
--- a/assets/minecraft/textures/gui/title/background/panorama_5.png
+++ b/assets/minecraft/textures/gui/title/background/panorama_5.png
--- a/assets/minecraft/textures/item/leather_chestplate_overlay.png
+++ b/assets/minecraft/textures/item/leather_chestplate_overlay.png
--- a/assets/minecraft/textures/item/sea_pickle.png
+++ b/assets/minecraft/textures/item/sea_pickle.png
--- a/assets/minecraft/textures/models/armor/iron_layer_2.png
+++ b/assets/minecraft/textures/models/armor/iron_layer_2.png
--- a/links.txt
+++ b/links.txt
@@ -4,7 +4,7 @@ Looking for our license? You can find it here: https://compliancepack.net/licens

 Compliance 32x links:
 - Website: https://compliancepack.net/
- Addons: https://compliancepack.net/addons#/
+- Add-ons: https://compliancepack.net/addons#/
 - Discord: https://discord.gg/sN9YRQbBv7
 - Twitter: https://twitter.com/CompliancePack
 - Github: https://github.com/Compliance-Resource-Pack