Merge remote-tracking branch 'upstream/master' into chatterino7

.CI/chatterino-installer.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Chatterino7"
-#define MyAppVersion "7.4.6"
+#define MyAppVersion "7.5.0"
 #define MyAppPublisher "7TV"
 #define MyAppURL "https://www.chatterino.com"
 #define MyAppExeName "chatterino.exe"

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unversioned
 
+## 2.5.0-beta.1
+
 - Major: Twitch follower emotes can now be correctly tabbed in other channels when you are subscribed to the channel the emote is from. (#4922)
 - Major: Added `/automod` split to track automod caught messages across all open channels the user moderates. (#4986, #5026)
 - Major: Moderators can now see restricted chat messages and suspicious treatment updates. (#5056, #5060)

CMakeLists.txt

@@ -42,7 +42,7 @@ if(BUILD_BENCHMARKS)
 endif()
 
 project(chatterino 
-    VERSION 7.4.6
+    VERSION 7.5.0
     DESCRIPTION "Chat client for twitch.tv"
     HOMEPAGE_URL "https://chatterino.com/"
 )

docs/make-release.md

@@ -8,7 +8,9 @@
 - [ ] Add a new release at the top of the `releases` key in `resources/com.chatterino.chatterino.appdata.xml`  
        This cannot use dash to denote a pre-release identifier, you have to use a tilde instead.
 
-- [ ] Updated version code in `.CI/chatterino-installer.iss`
+- [ ] Updated version code in `.CI/chatterino-installer.iss`  
+       This can only be "whole versions", so if you're releasing `2.4.0-beta` you'll need to condense it to `2.4.0`
+
 - [ ] Update the changelog `## Unreleased` section to the new version `CHANGELOG.md`  
        Make sure to leave the `## Unreleased` line unchanged for easier merges
 

resources/com.chatterino.chatterino.appdata.xml

@@ -34,6 +34,9 @@
         <binary>chatterino</binary>
     </provides>
     <releases>
+        <release version="7.5.0" date="2024-04-07">
+            <url>https://github.com/SevenTV/chatterino7/releases/tag/v7.5.0-beta.1</url>
+        </release>
         <release version="7.4.6" date="2023-09-28">
             <url>https://github.com/SevenTV/chatterino7/releases/tag/v7.4.6</url>
         </release>
@@ -50,4 +53,4 @@
             <url>https://github.com/SevenTV/chatterino7/releases/tag/v7.4.2</url>
         </release>
     </releases>
-</component>
+</component>

src/common/Version.hpp

@@ -24,7 +24,7 @@
  *  - 2.4.0-alpha.2
  *  - 2.4.0-alpha
  **/
-#define CHATTERINO_VERSION "7.4.6"
+#define CHATTERINO_VERSION "7.5.0-beta.1"
 
 #if defined(Q_OS_WIN)
 #    define CHATTERINO_OS "win"