Merge remote-tracking branch 'upstream/main' into cooker-0.7.0b-icenine451

docs/.nojekyll

@@ -0,0 +1 @@
+

docs/.well-known/org.flathub.VerifiedApps.txt

@@ -0,0 +1 @@
+b98237ec-72ae-4779-bc52-2802057a83ff

net.retrodeck.retrodeck.appdata.xml

@@ -65,13 +65,20 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
-      <release version="0.6.4b" date="2023-03-25">
+      <release version="0.6.4b" date="2023-04-04">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.4b</url>
          <description>
-            <p>New features - General:</p>
+            <p>New features - General</p>
             <ul>
-               <li>Updated EmulationStation Desktop Edition to 2.0</li>
-               <li>Removed legacy themes and added themes for ES-DE 2.0</li>
+               <li>Updated to ES-DE 2.0</li>
+               <li>Added the NSO Menu Interpreted theme</li>
+               <li>Updated all included themes</li>
+               <li>Updated the Emulators/RetroArch + cores</li>
+            </ul>
+            <p>Bug fixes and other changes</p>
+            <ul>
+               <li>Fixed an audio issue in the Primehack configuration</li>
+               <li>Various backend fixes</li>
             </ul>
          </description>
       </release>

net.retrodeck.retrodeck.yml

@@ -67,11 +67,11 @@ modules:
   # The version number is hardcoded in /app/retrodeck/version
   #
   # UPDATE STEPS FOR MAIN:
-  # [ ] Update the VERSION variable
-  # [ ] Update the appdata.xml with the version number and notes
-  # [ ] change branch into main in version-initialization (first one)
-  # [ ] change branch into main in retrodeck module (last one)
-  # [ ] if header (before modules) was edited, edit it even in flathub.yml
+  # [X] Update the VERSION variable
+  # [X] Update the appdata.xml with the version number and notes
+  # [X] change branch into main in version-initialization (first one)
+  # [X] change branch into main in retrodeck module (last one)
+  # [X] if header (before modules) was edited, edit it even in flathub.yml
   #
   - name: version-initialization
     buildsystem: simple
@@ -79,7 +79,7 @@ modules:
       - |
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/
-        VERSION="cooker-0.6.4b"
+        VERSION="0.6.4b"
         if [[ $VERSION == *"cooker"* ]];
         then
           VERSION="$VERSION-[$(git rev-parse --short HEAD)]"
@@ -89,7 +89,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.4b
+        branch: main
 
   - name: xmlstarlet
     config-opts:
@@ -1124,4 +1124,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.4b
+        branch: main

rd-submodules/retroarch

@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit 717b78093797270877ec416e58082f1c71d435d8