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

…0-lts
CyclopsMC · Jul 22, 2024 · 6ad2f5e · 6ad2f5e
2 parents dc19a5b + e9030d4
commit 6ad2f5e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/resources/changelog/1.19.2-1.2.34.txt b/resources/changelog/1.19.2-1.2.34.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Fix Promise of Tenacity III not showing in book, Closes #1031
+
diff --git a/resources/changelog/1.19.2-1.2.35.txt b/resources/changelog/1.19.2-1.2.35.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Remove unused chalice texture, Closes #1035
+
diff --git a/src/main/resources/assets/evilcraft/textures/model/chalice.png b/src/main/resources/assets/evilcraft/textures/model/chalice.png