Merged upstream into my local branch

Signed-off-by: toastie_t0ast <toastie@toastiet0ast.com>

CHANGELOG.md

@@ -75,7 +75,7 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.1.0/) except da
 - Remind will now show a timestamp tag for durations
 - Only `Gpt35Turbo` and `Gpt4o` are valid inputs in games.yml now
 - `data/patron.yml` changed. It now has limits. The entire feature limit system has been reworked. Your previous settings will be reset
-- A lot of updates to bot strings (thanks Ene)
+- A lot of updates to bot strings
 - Improved cleanup command to delete a lot more data once cleanup is ran, not only guild configs (please don't use this command unless you have your database bakced up and you know 100% what you're doing)
 
 ### Fixed
@@ -84,7 +84,7 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.1.0/) except da
 - Fixed shopbuy %user% placeholders and updated help text
 - All 'feed overloads should now work"
 - `'xpexclude` should will now work with forums too. If you exclude a forum you won't be able to gain xp in any of the threads.
-- Fixed remind not showing correct time (thx cata)
+- Fixed remind not showing correct time
 
 ### Removed
 

build.ps1

@@ -1,46 +0,0 @@
-Write-Output ""
-Write-Output "███████╗██╗     ██╗     ██╗███████╗██████╗  ██████╗ ████████╗"
-Write-Output "██╔════╝██║     ██║     ██║██╔════╝██╔══██╗██╔═══██╗╚══██╔══╝"
-Write-Output "█████╗  ██║     ██║     ██║█████╗  ██████╔╝██║   ██║   ██║   "
-Write-Output "██╔══╝  ██║     ██║     ██║██╔══╝  ██╔══██╗██║   ██║   ██║   "
-Write-Output "███████╗███████╗███████╗██║███████╗██████╔╝╚██████╔╝   ██║   "
-Write-Output "╚══════╝╚══════╝╚══════╝╚═╝╚══════╝╚═════╝  ╚═════╝    ╚═╝   "
-Write-Output ""
-Write-Output "Copyright © 2024 Toastie_t0ast & EllieBotDevs"
-Write-Output ""
-
-Write-Output ""
-Write-Output "Publishing EllieBot"
-Write-Output ""
-
-Write-Output ""
-dotnet publish -c Release -r linux-x64 --self-contained -o elliebot-linux-x64  src/EllieBot/EllieBot.csproj
-Write-Output ""
-dotnet publish -c Release -r linux-arm64 --self-contained -o elliebot-linux-arm64  src/EllieBot/EllieBot.csproj
-Write-Output ""
-dotnet publish -c Release -r win-x64 --self-contained -o elliebot-windows-x64  src/EllieBot/EllieBot.csproj
-Write-Output ""
-dotnet publish -c Release -r win-arm64 --self-contained -o elliebot-windows-arm64  src/EllieBot/EllieBot.csproj
-Write-Output ""
-dotnet publish -c Release -r osx-x64 --self-contained -o elliebot-osx-x64  src/EllieBot/EllieBot.csproj
-Write-Output ""
-dotnet publish -c Release -r osx-arm64 --self-contained -o elliebot-osx-arm64  src/EllieBot/EllieBot.csproj
-
-Write-Output ""
-Write-Output "Preparing the Windows installer build."
-Write-Output ""
-
-dotnet clean
-dotnet restore -f --no-cache -v n
-dotnet publish -c Release --self-contained --runtime win-x64 /p:Version=5.1.4 src/EllieBot
-
-Write-Output ""
-Write-Output ""
-Write-Output "Finished the initial build script"
-Write-Output ""
-Write-Output "To build the Windows installer please install Inno Setup from"
-Write-Output "https://jrsoftware.org/isdl.php"
-Write-Output "And compile the exe_builder.iss"
-Write-Output ""
-Write-Output "If you are running on Windows please run the wsl command"
-Write-Output "then run build.sh"

build.sh

@@ -1,18 +0,0 @@
-echo ""
-echo "Compressing build files"
-echo ""
-
-tar cvf 5.1.4-linux-x64-build.tar elliebot-linux-x64/*
-tar cvf 5.1.4-linux-arm64-build.tar elliebot-linux-arm64/*
-tar cvf 5.1.4-osx-x64-build.tar elliebot-osx-x64/*
-tar cvf 5.1.4-osx-arm64-build.tar elliebot-osx-arm64/*
-zip -r 5.1.4-windows-x64-build.zip elliebot-windows-x64/*
-zip -r 5.1.4-windows-arm64-build.zip elliebot-windows-arm64/*
-
-echo ""
-echo "Moving the installer file you would have generated"
-echo "if you followed the instructions in the bottom of the build.ps1 file"
-echo "to the directory this script in run in."
-echo ""
-
-mv ellie-installers/5.1.4/ellie-setup-5.1.4.exe ellie-setup-5.1.4.exe