Merge branch 'Jappa-1.18.1' into Jappa-1.19

2026-04-22 19:24:43 -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/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"
+    }
+}