Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.20

CyclopsMC · Sep 9, 2023 · 34cf407 · 34cf407
2 parents 68ce93b + 7a7e530
commit 34cf407
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/resources/changelog/1.18.2-1.2.21.txt b/resources/changelog/1.18.2-1.2.21.txt
@@ -0,0 +1,8 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.15.0 or higher.
+
+Fixes:
+* Add Farming for Blockheads merchant to spirit blacklist
+  It causes crashes due to rendering issues.
+  Closes #1004
+
diff --git a/resources/changelog/1.19.2-1.2.27.txt b/resources/changelog/1.19.2-1.2.27.txt
@@ -0,0 +1,8 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Add Farming for Blockheads merchant to spirit blacklist
+  It causes crashes due to rendering issues.
+  Closes #1004
+
diff --git a/src/main/java/org/cyclops/evilcraft/entity/monster/EntityVengeanceSpiritConfig.java b/src/main/java/org/cyclops/evilcraft/entity/monster/EntityVengeanceSpiritConfig.java
@@ -39,7 +39,8 @@ public class EntityVengeanceSpiritConfig extends EntityConfig<EntityVengeanceSpi
             "evilcraft:vengeance_spirit",
             "evilcraft:controlled_zombie",
             "evilcraft:werewolf",
-            "minecraft:ender_dragon"
+            "minecraft:ender_dragon",
+            "farmingforblockheads:merchant" // It causes rendering issues: https://github.com/CyclopsMC/EvilCraft/issues/1004
     );
 
     @ConfigurableProperty(category = "mob", comment = "Whether vengeance spirits should always be visible in creative mode.")