From 99c495306ba53c88c94c5deebc2e5b53e4a2a269 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Thu, 30 Mar 2023 11:54:04 +0000
Subject: [PATCH 1/6] WEBSITE: added verification token to verify Flathub beta

---
 docs/.well-known/org.flathub.VerifiedApps.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/.well-known/org.flathub.VerifiedApps.txt

diff --git a/docs/.well-known/org.flathub.VerifiedApps.txt b/docs/.well-known/org.flathub.VerifiedApps.txt
new file mode 100644
index 00000000..0eb41220
--- /dev/null
+++ b/docs/.well-known/org.flathub.VerifiedApps.txt
@@ -0,0 +1 @@
+b98237ec-72ae-4779-bc52-2802057a83ff
\ No newline at end of file

From 9c63730008beaf2c9495d80f9e621e0887dd7327 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Thu, 30 Mar 2023 15:01:28 +0200
Subject: [PATCH 2/6] Create .nojekyll

---
 docs/.nojekyll | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/.nojekyll

diff --git a/docs/.nojekyll b/docs/.nojekyll
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docs/.nojekyll
@@ -0,0 +1 @@
+

From 35e4e40ece0bf88a5b5275fbaa23a58fcaed3ba9 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Tue, 4 Apr 2023 18:38:08 +0000
Subject: [PATCH 3/6] APPDATA: Release notes updated [skip ci]

---
 net.retrodeck.retrodeck.appdata.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index e2937c13..6d30badb 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/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>

From 92150c94d471b3425fa7c7f91831b3d330dccd91 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Tue, 4 Apr 2023 18:40:25 +0000
Subject: [PATCH 4/6] RetroDECK v0.6.4b

---
 net.retrodeck.retrodeck.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 7342b293..d40e02f0 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -66,11 +66,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
@@ -78,7 +78,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)]"
@@ -88,7 +88,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.4b
+        branch: 0.6.4b
 
   - name: xmlstarlet
     config-opts:
@@ -1107,4 +1107,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.4b
\ No newline at end of file
+        branch: 0.6.4b
\ No newline at end of file

From 0a7a9e87505c46f8b651547238dedc34304133a1 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Tue, 4 Apr 2023 18:42:13 +0000
Subject: [PATCH 5/6] RetroDECK v0.6.4b

---
 net.retrodeck.retrodeck.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index d40e02f0..cf45ad81 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -88,7 +88,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: 0.6.4b
+        branch: main
 
   - name: xmlstarlet
     config-opts:
@@ -1107,4 +1107,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: 0.6.4b
\ No newline at end of file
+        branch: main
\ No newline at end of file

From 487c86720b726d823b9622d0db4623dc94530783 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Tue, 4 Apr 2023 18:48:35 +0000
Subject: [PATCH 6/6] RetroDECK v0.6.4b

---
 rd-submodules/retroarch      | 2 +-
 rd-submodules/shared-modules | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 0b1cfb79..717b7809 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit 717b78093797270877ec416e58082f1c71d435d8
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index ae5d7192..a2441b96 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit ae5d7192c6a37f2c754fd92685a72d514931131a
+Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42