Merge remote-tracking branch 'refs/remotes/origin/main'

TrotCraft/client/index.toml

@@ -421,5 +421,5 @@ metafile = true
 
 [[files]]
 file = "resourcepacks/translations-for-sodium.pw.toml"
-hash = "d112ef73f801604bece87d9a9dba6773ac9c95b0a0d0dc7b707ebbb419d5b7f3"
+hash = "629c0d53d62818586ae5f77edfa8e340800ef166c86447baf5d8d8d77ec5ec1b"
 metafile = true

TrotCraft/client/pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "67be1cee069cc8ccc28f874d79c532f1dc6290dfdba14908ce20fa0723932a9b"
+hash = "8d48a6bceaa9b14d5047dd2d5e2c7f906b86c7337e18e695ac44f61b426f7e7c"
 
 [versions]
 fabric = "0.15.9"

TrotCraft/client/resourcepacks/translations-for-sodium.pw.toml

@@ -3,11 +3,11 @@ filename = "SodiumTranslations.zip"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/yfDziwn1/versions/H3CwWhek/SodiumTranslations.zip"
+url = "https://cdn.modrinth.com/data/yfDziwn1/versions/jxHmg0uz/SodiumTranslations.zip"
 hash-format = "sha1"
-hash = "546c857d84dfddb039112ceb7f2fe305d6cb2726"
+hash = "141e855f76a444bec32d24b5477dd637a4fe01b6"
 
 [update]
 [update.modrinth]
 mod-id = "yfDziwn1"
-version = "H3CwWhek"
+version = "jxHmg0uz"

TrotCraft/server/config/yosbr/config/MiniMOTD/main.conf

@@ -132,7 +132,7 @@ motds=[
         #  of a file in the icons folder (excluding the '.png' extension)
         #    ex: icon="myIconFile"
         icon=random
-        line1="<#e6ac65>Twilight are you okay?"
+        line1="<#CC9CDF>Twilight are you okay?"
         line2=""
     },
     {
@@ -141,16 +141,7 @@ motds=[
         #  of a file in the icons folder (excluding the '.png' extension)
         #    ex: icon="myIconFile"
         icon=random
-        line1="<#e6ac65><bold>don't eat the streamer"
-        line2=""
-    },
-    {
-        # Set the icon to use with this MOTD
-        #  Either use 'random' to randomly choose an icon, or use the name
-        #  of a file in the icons folder (excluding the '.png' extension)
-        #    ex: icon="myIconFile"
-        icon=random
-        line1="<#e6ac65><bold>don't eat the streamer"
+        line1="<bold>Hair is made of hair"
         line2=""
     }
 ]