Merge branch '1.20.2' into 1.20.4

* 1.20.2: compat with curios
Faboslav · Mar 15, 2024 · 50ecc12 · 50ecc12
2 parents a9056e0 + b94525e
commit 50ecc12
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/neoforge/src/main/resources/data/curios/tags/items/charm.json b/neoforge/src/main/resources/data/curios/tags/items/charm.json
@@ -0,0 +1,27 @@
+{
+	"replace": false,
+	"values": [
+		"#friendsandfoes:totems",
+		"minecraft:totem_of_undying",
+		{
+			"id": "biomemakeover:enchanted_totem",
+			"required": false
+		},
+		{
+			"id": "voidtotem:totem_of_void_undying",
+			"required": false
+		},
+		{
+			"id": "#voidtotem:additional_totems",
+			"required": false
+		},
+		{
+			"id": "fwaystones:void_totem",
+			"required": false
+		},
+		{
+			"id": "netheriteextras:totem_of_neverdying",
+			"required": false
+		}
+	]
+}
diff --git a/neoforge/src/main/resources/data/friendsandfoes/curios/entities/totems.json b/neoforge/src/main/resources/data/friendsandfoes/curios/entities/totems.json
@@ -0,0 +1,8 @@
+{
+	"entities": [
+		"player"
+	],
+	"slots": [
+		"charm"
+	]
+}