Merge pull request Ladysnake#664 from mrsterner/1.20

blabber fix and locki update
Redfan2 · Jun 16, 2024 · 3ac7693 · 3ac7693
2 parents be4ec79 + ceaaf3e
commit 3ac7693
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ fiberToCloth = "v3-SNAPSHOT"
 fiber = "0.23.0-2"
 fpa = "0.2-SNAPSHOT"
 impersonate = "2.10.2"
-locki = "0.11.0"
+locki = "0.11.1"
 loom = "1.6.+"
 modmenu = "7.2.2"
 pal = "1.8.0"

diff --git a/...li_books/en_us/entries/rituals/decay.json → ..._shadows/en_us/entries/rituals/decay.json b/...li_books/en_us/entries/rituals/decay.json → ..._shadows/en_us/entries/rituals/decay.json
@@ -10,12 +10,12 @@
     },
     {
       "type": "bewitchment:ritual",
-      "recipe": "darkrites:rituals/decay_zombie",
+      "recipe": "requiem:ritual/decay_zombie",
       "text": "Rot the flesh of a living demon."
     },
     {
       "type": "bewitchment:ritual",
-      "recipe": "darkrites:rituals/decay_skeleton",
+      "recipe": "requiem:ritual/decay_skeleton",
       "text": "Decay the skin of a living demon."
     }
   ]

diff --git a/src/main/resources/assets/requiem/lang/en_us.json b/src/main/resources/assets/requiem/lang/en_us.json
@@ -241,5 +241,8 @@
 
   "stat.requiem.interact_with_rift": "[Requiem] Interactions with Obelisk Rift",
 
-  "requiem.message.peaceful_despawn": "This host may not belong to such a peaceful world"
+  "requiem.message.peaceful_despawn": "This host may not belong to such a peaceful world",
+
+  "ritual.requiem.ritual.decay_zombie": "Decay Zombie",
+  "ritual.requiem.ritual.decay_skeleton": "Decay Skeleton"
 }
diff --git a/...iem/blabber_dialogues/remnant_choice.json → ...iem/blabber/dialogues/remnant_choice.json b/...iem/blabber_dialogues/remnant_choice.json → ...iem/blabber/dialogues/remnant_choice.json
diff --git a/src/main/resources/data/requiem/patchouli_books/book_of_shadows_extension/book.json b/src/main/resources/data/requiem/patchouli_books/book_of_shadows_extension/book.json