Merge remote-tracking branch 'origin/main'

Author: ThatGravyBoat

cloudflare/items.min.json

@@ -1,4 +1,4 @@
 {
-    "items": "f9be8845a2be3ed788fdbd810afadf8897ac7239",
+    "items": "0fe32c8deba04155a33bf3449bd94a09df9442d6",
     "pets": "f6904b2282e9acd83a947f24e4fb290be5659d3e"
 }

cloudflare/shas.json

@@ -34794,8 +34794,8 @@
             "minecraft:hide_additional_tooltip": {},
             "minecraft:custom_data": {
                 "year": 2023,
-                "edition": null,
-                "-1,id": "EERIE_TREAT"
+                "edition": -1,
+                "id": "EERIE_TREAT"
             },
             "minecraft:custom_name": "'§9Eerie Treat'",
             "minecraft:lore": [
@@ -59621,8 +59621,8 @@
             "minecraft:hide_additional_tooltip": {},
             "minecraft:custom_data": {
                 "year": 2022,
-                "edition": null,
-                "-1,id": "GREAT_SPOOK_ARTIFACT"
+                "edition": -1,
+                "id": "GREAT_SPOOK_ARTIFACT"
             },
             "minecraft:custom_name": "'§9Great Spook Artifact'",
             "minecraft:lore": [
@@ -59773,8 +59773,8 @@
             "minecraft:hide_additional_tooltip": {},
             "minecraft:custom_data": {
                 "year": 2022,
-                "edition": null,
-                "-1,id": "GREAT_SPOOK_CLOAK"
+                "edition": -1,
+                "id": "GREAT_SPOOK_CLOAK"
             },
             "minecraft:custom_name": "'§5Great Spook Cloak'",
             "minecraft:lore": [
@@ -59808,8 +59808,8 @@
             "minecraft:hide_additional_tooltip": {},
             "minecraft:custom_data": {
                 "year": 2022,
-                "edition": null,
-                "-1,id": "GREAT_SPOOK_GLOVES"
+                "edition": -1,
+                "id": "GREAT_SPOOK_GLOVES"
             },
             "minecraft:custom_name": "'§5Great Spook Gloves'",
             "minecraft:lore": [
@@ -59926,8 +59926,8 @@
             "minecraft:hide_additional_tooltip": {},
             "minecraft:custom_data": {
                 "year": 2022,
-                "edition": null,
-                "-1,id": "GREAT_SPOOK_NECKLACE"
+                "edition": -1,
+                "id": "GREAT_SPOOK_NECKLACE"
             },
             "minecraft:custom_name": "'§5Great Spook Necklace'",
             "minecraft:lore": [
@@ -59990,8 +59990,8 @@
             "minecraft:hide_additional_tooltip": {},
             "minecraft:custom_data": {
                 "year": 2023,
-                "edition": null,
-                "-1,id": "GREAT_SPOOK_REFORGING_MANUAL"
+                "edition": -1,
+                "id": "GREAT_SPOOK_REFORGING_MANUAL"
             },
             "minecraft:enchantment_glint_override": true,
             "minecraft:custom_name": "'§5Great Spook Reforging Manual'",
@@ -60086,8 +60086,8 @@
             "minecraft:hide_additional_tooltip": {},
             "minecraft:custom_data": {
                 "year": 2022,
-                "edition": null,
-                "-1,id": "GREAT_SPOOK_SWORD"
+                "edition": -1,
+                "id": "GREAT_SPOOK_SWORD"
             },
             "minecraft:unbreakable": {
                 "show_in_tooltip": false
@@ -119554,8 +119554,8 @@
             "minecraft:hide_additional_tooltip": {},
             "minecraft:custom_data": {
                 "date": 1733853871357,
-                "L,edition": null,
-                "-1,id": "RIFT_COMPLETION_MEMENTO",
+                "L,edition": -1,
+                "id": "RIFT_COMPLETION_MEMENTO",
                 "recipient_name": "§b[MVP§3+§b] Eisengolem§f",
                 "recipient_id": "8a9f1841-48e9-48ed-b14f-76a124e6c9df"
             },
@@ -123521,8 +123521,8 @@
             "minecraft:hide_additional_tooltip": {},
             "minecraft:custom_data": {
                 "year": 2023,
-                "edition": null,
-                "-1,id": "SCARY_GRIMOIRE"
+                "edition": -1,
+                "id": "SCARY_GRIMOIRE"
             },
             "minecraft:custom_name": "'§5Scary Grimoire'",
             "minecraft:lore": [