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

Author: Nerixyz

.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.5.4"
+#define MyAppVersion "7.5.5"
 #define MyAppPublisher "7TV"
 #define MyAppURL "https://www.chatterino.com"
 #define MyAppExeName "chatterino.exe"

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unversioned
 
+## 2.5.5-beta.1
+
 - Minor: Added a countdown timer to the input box to show when you can chat again during slow mode or after a timeout. This feature is disabled by default, and can be enabled with the "Show countdown on slow mode or when timed out" setting. (#6782, #6791)
 - Minor: Add search engine selection for context menu search action. (#6743, #6770)
 - Minor: Add a separate highlight option for watchstreak notifications. (#6571, #6581)

CMakeLists.txt

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

resources/com.chatterino.chatterino.appdata.xml

@@ -34,6 +34,9 @@
         <binary>chatterino</binary>
     </provides>
     <releases>
+        <release version="7.5.5~beta1" date="2026-03-01">
+            <url>https://github.com/SevenTV/chatterino7/releases/tag/v7.5.5-beta.1</url>
+        </release>
         <release version="7.5.4" date="2025-09-21">
             <url>https://github.com/SevenTV/chatterino7/releases/tag/v7.5.4</url>
         </release>

src/common/Version.hpp

@@ -33,7 +33,7 @@ namespace chatterino {
  *  - 2.4.0-alpha.2
  *  - 2.4.0-alpha
  **/
-inline const QString CHATTERINO_VERSION = QStringLiteral("7.5.4");
+inline const QString CHATTERINO_VERSION = QStringLiteral("7.5.5-beta.1");
 
 class Version
 {