From 070d272dda51309c00d24124fa5b05d7df1d7115 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Thu, 7 Sep 2023 00:21:25 +1000
Subject: some raffle stuff and other stuff (#975)

* one museum item and change contributors and discord stuff

* some new stuff from raffles

* wiki urls

* salmon hat

* no more colour names :sob:

* update golden ball reforge

* merge conflicts

* wiki urls

* century talisman
---
 constants/misc.json          | 25 +++++++++++++------------
 constants/museum.json        |  6 +++++-
 constants/reforgestones.json | 12 ++++++------
 3 files changed, 24 insertions(+), 19 deletions(-)

(limited to 'constants')

diff --git a/constants/misc.json b/constants/misc.json
index 2a6ea8ed..4868e0b9 100644
--- a/constants/misc.json
+++ b/constants/misc.json
@@ -1698,21 +1698,22 @@
       "§f - §aCobble8§7: Feature Contributor",
       "§f - §awhalker§7: Feature Contributor",
       "§f - §aVixid1§7: Feature Contributor",
+      "§f - §aCalMWolfs§7: Feature Contributor",
       "",
       "§b§lDiscord Staff:",
       "§f - §bIRONM00N#0001§7: §cAdmin",
-      "§f - §bThatGravyBoat#0001§7: §cAdmin",
-      "§f - §bnopo#6969§7: §cAdmin",
-      "§f - §bjani270#0119§7: §cAdmin",
-      "§f - §bMadeline#6969§7: §2Sr. Moderator",
-      "§f - §bTyman#5998§7: §2Sr. Moderator",
-      "§f - §bapotato#1965§7: §2Moderator",
-      "§f - §bBestower#6073§7: §2Moderator",
-      "§f - §bHasnu#4411§7: §2Moderator",
-      "§f - §bgeorge.#0550: §2Moderator",
-      "§f - §bDoKM#7224: §2Moderator",
-      "§f - §bLulonaut#3350: §2Moderator",
-      "§f - §bMisterCheezeCake#1662: §aHelper"
+      "§f - §bthatgravyboat§7: §cAdmin",
+      "§f - §bnopothegamer§7: §cAdmin",
+      "§f - §bjani270§7: §cAdmin",
+      "§f - §bdemon.core§7: §2Sr. Moderator",
+      "§f - §bt.y.y§7: §2Sr. Moderator",
+      "§f - §bapotato1§7: §2Moderator",
+      "§f - §bbestower§7: §2Moderator",
+      "§f - §bhasnu777§7: §2Moderator",
+      "§f - §bgeorgefw§7: §2Moderator",
+      "§f - §bdokm§7: §2Moderator",
+      "§f - §blulonaut§7: §2Moderator",
+      "§f - §bmistercheezecake§7: §aHelper"
     ]
   },
   "cosmeticsinfo": {
diff --git a/constants/museum.json b/constants/museum.json
index 6f543ac8..18d3179c 100644
--- a/constants/museum.json
+++ b/constants/museum.json
@@ -623,7 +623,11 @@
     "PET_SKIN_HORSE_ZOMBIE",
     "EPOCH_CAKE_RED",
     "MAGMA_FISH_HAT",
-    "BLAZE_HAT"
+    "BLAZE_HAT",
+    "SEA_LANTERN_HAT",
+    "EPOCH_CAKE_DARK_GREEN",
+    "EPOCH_CAKE_GRAY",
+    "ASPECT_OF_THE_JERRY_SIGNATURE"
   ],
   "armor_to_id": {
     "FARM_SUIT": "FARM_SUIT_HELMET",
diff --git a/constants/reforgestones.json b/constants/reforgestones.json
index f5670c2a..6b4ffb44 100644
--- a/constants/reforgestones.json
+++ b/constants/reforgestones.json
@@ -1026,12 +1026,12 @@
       "MYTHIC": 600000
     },
     "reforgeAbility": {
-      "COMMON": "§7Grants §a+1 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.",
-      "UNCOMMON": "§7Grants §a+2 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.",
-      "RARE": "§7Grants §a+3 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.",
-      "EPIC": "§7Grants §a+5 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.",
-      "LEGENDARY": "§7Grants §a+7 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.",
-      "MYTHIC": "§7Grants §a+10 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break."
+      "COMMON": "§7Grants §a+1 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. Grants §6+0.2 coins §7per crop.",
+      "UNCOMMON": "§7Grants §a+2 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. Grants §6+0.2 coins §7per crop.",
+      "RARE": "§7Grants §a+3 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. Grants §6+0.2 coins §7per crop.",
+      "EPIC": "§7Grants §a+5 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. Grants §6+0.2 coins §7per crop.",
+      "LEGENDARY": "§7Grants §a+7 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. Grants §6+0.2 coins §7per crop.",
+      "MYTHIC": "§7Grants §a+10 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. Grants §6+0.2 coins §7per crop."
     },
     "reforgeStats": {
       "COMMON": {
-- 
cgit