diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 index 07f28093..28e3e733 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 @@ -17,6 +17,14 @@ "quenched": "Quenched Shard Staff", "mindsplice": "Mindsplice Staff" }, + + tags: { + "tag.item.hexcasting:brainswept_circle_components": "Brainswept Circle Components", + "tag.item.hexcasting:directrices": "Directrices", + "tag.item.hexcasting:grants_root_advancement": "Grants Rood Advancement", + "tag.item.hexcasting:impeti": "Impeti", + "tag.item.hexcasting:seal_materials": "Seal Materials", + }, "amethyst_dust": "Amethyst Dust", "charged_amethyst": "Charged Amethyst", diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/interop/gravity.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/interop/gravity.json deleted file mode 100644 index 8a638d55..00000000 --- a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/interop/gravity.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "hexcasting.entry.interop.gravity", - "icon": "minecraft:anvil", - "category": "hexcasting:interop", - "advancement": "hexcasting:root", - "flag": "mod:gravity_api", - "pages": [ - "hexcasting.page.interop.gravity.1", - { - "type": "hexcasting:pattern", - "op_id": "hexcasting:interop/gravity/get", - "anchor": "hexcasting:interop/gravity/get", - "input": "entity", - "output": "vector", - "text": "hexcasting.page.interop.gravity.get" - }, - { - "type": "hexcasting:pattern", - "op_id": "hexcasting:interop/gravity/set", - "anchor": "hexcasting:interop/gravity/set", - "input": "entity, vector", - "output": "", - "text": "hexcasting.page.interop.gravity.set" - } - ] -} diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_0.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_0.png index 4d4ca303..fe10792f 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_0.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_1.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_1.png index 81482fd5..0ca987bb 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_1.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_2.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_2.png index b7efcdb0..27ce208c 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_2.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_3.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_3.png index 9b84c9df..1e00b3a1 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_3.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_3.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_4.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_4.png index 956fb51b..f6bd6597 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_4.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_large_4.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_0.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_0.png index d6adff4f..8111950c 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_0.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_1.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_1.png index bf33ea0e..cd657899 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_1.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_2.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_2.png index 17952bf5..faa0b4d7 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_2.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_3.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_3.png index bc8ae5d5..0510e935 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_3.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_3.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_4.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_4.png index b514c398..5e3d1c58 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_4.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_larger_4.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_0.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_0.png index 09b63b6c..2865b28a 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_0.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_1.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_1.png index 28e2998a..441d8a6e 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_1.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_2.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_2.png index d158413d..0adb4390 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_2.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_3.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_3.png index 55ee09f4..9172ded4 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_3.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_3.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_4.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_4.png index cd276734..40930d83 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_4.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_largest_4.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_0.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_0.png index 76436985..33e624ee 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_0.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_1.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_1.png index 6311c1c5..d65333a3 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_1.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_2.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_2.png index a675a45d..bdabbbe7 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_2.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_3.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_3.png index d4a129ef..213cb1bc 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_3.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_3.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_4.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_4.png index c5885214..8c9c82b8 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_4.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_medium_4.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_0.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_0.png index 94044254..213c4093 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_0.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_1.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_1.png index b4bbca44..ae7fb12e 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_1.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_2.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_2.png index dc57196e..2a5b168c 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_2.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_3.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_3.png index dac239f3..95bf5cc4 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_3.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_3.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_4.png b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_4.png index 71795d4b..0aecc5a4 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_4.png and b/Common/src/main/resources/assets/hexcasting/textures/item/phial/phial_small_4.png differ diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index deb99b8a..7465a77c 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -50,13 +50,13 @@ "java": ">=17", "fabricloader": ">=0.14", "fabric": ">=0.84", - "fabric-language-kotlin": ">=1.9.5+kotlin.1.8.22", + "fabric-language-kotlin": ">=1.9.4+kotlin.1.8.22", "cardinal-components-base": "~5.2.1", "cardinal-components-entity": "~5.2.1", "cardinal-components-item": "~5.2.1", "cardinal-components-block": "~5.2.1", - "paucal": "0.6.x", - "cloth-config": "11.0.x", + "paucal": "*", + "cloth-config": "*", "patchouli": ">=1.20.1-80" }, "suggests": {