Merge branch 'main' into release/v2.4

bump metainfo version
2026-06-09 20:03:52 +03:00 · 2026-06-09 02:34:53 +08:00 · 2026-06-08 22:21:24 +08:00 · 2026-06-08 22:19:50 +08:00 · 2026-06-08 00:37:07 +08:00 · 2026-06-08 00:11:18 +08:00
2 changed files with 3 additions and 3 deletions
--- a/scripts/flatpak/com.orcaslicer.OrcaSlicer.metainfo.xml
+++ b/scripts/flatpak/com.orcaslicer.OrcaSlicer.metainfo.xml
@@ -45,8 +45,8 @@
        <color type="primary" scheme_preference="dark">#00695C</color>
    </branding>
    <releases>
-        <release version="2.4.0-dev" date="2026-05-22" type="development">
-            <url type="details">https://github.com/OrcaSlicer/OrcaSlicer/releases/tag/nightly-builds</url>
+        <release version="2.4.0-beta" date="2026-06-08" type="development">
+            <url type="details">https://github.com/OrcaSlicer/OrcaSlicer/releases/tag/2.4.0-beta</url>
            <description>
                <p>See the release page for detailed changelog.</p>
            </description>
--- a/version.inc
+++ b/version.inc
@@ -7,7 +7,7 @@ set(SLIC3R_APP_KEY "OrcaSlicer")
 if(NOT DEFINED BBL_INTERNAL_TESTING)
 set(BBL_INTERNAL_TESTING "0")
 endif()
-set(SoftFever_VERSION "2.4.0-dev")
+set(SoftFever_VERSION "2.4.0-beta")
 string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)"
       SoftFever_VERSION_MATCH ${SoftFever_VERSION})
 set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})
Author	SHA1	Message	Date
SoftFever	fc9a8aa93f	Merge branch 'main' into release/v2.4	2026-06-09 02:34:53 +08:00
SoftFever	21f48a2654	bump metainfo version	2026-06-08 22:21:24 +08:00
SoftFever	548f291a81	Merge branch 'main' into release/v2.4	2026-06-08 22:19:50 +08:00
SoftFever	bc3af3d00f	Merge branch 'main' into release/v2.4	2026-06-08 00:37:07 +08:00
SoftFever	269eb81028	bump version to 2.4.0-beta	2026-06-08 00:11:18 +08:00
SoftFever	08d4ae7dbd	Merge branch 'main' into release/v2.4	2026-06-08 00:10:46 +08:00
SoftFever	b1411e253f	Merge branch 'main' into release/v2.4	2026-06-01 00:59:02 +08:00
SoftFever	42cce5399c	bump flatpak version	2026-05-23 18:14:45 +08:00
SoftFever	b17f5e3946	bump version to 2.4.0-alpha	2026-05-23 18:14:45 +08:00