diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cc8038353..2944fbf02 100644 --- 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/src/main/resources/data/requiem/patchouli_books/en_us/entries/rituals/decay.json b/src/main/resources/assets/bewitchment/patchouli_books/book_of_shadows/en_us/entries/rituals/decay.json similarity index 87% rename from src/main/resources/data/requiem/patchouli_books/en_us/entries/rituals/decay.json rename to src/main/resources/assets/bewitchment/patchouli_books/book_of_shadows/en_us/entries/rituals/decay.json index 98b652c58..c48fd2d7f 100644 --- a/src/main/resources/data/requiem/patchouli_books/en_us/entries/rituals/decay.json +++ b/src/main/resources/assets/bewitchment/patchouli_books/book_of_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 index 5796b2095..7b2072f01 100644 --- 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/src/main/resources/data/requiem/blabber_dialogues/remnant_choice.json b/src/main/resources/data/requiem/blabber/dialogues/remnant_choice.json similarity index 100% rename from src/main/resources/data/requiem/blabber_dialogues/remnant_choice.json rename to src/main/resources/data/requiem/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 deleted file mode 100644 index 73a732067..000000000 --- a/src/main/resources/data/requiem/patchouli_books/book_of_shadows_extension/book.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extend": "bewitchment:book_of_shadows" -}