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

.github/workflows/cooker-selfhosted.yml

@@ -17,9 +17,10 @@ jobs:
     runs-on: self-hosted
     steps:
 
-      # - name: Remove stuck mounts
+      # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317
-      #   run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
+      - name: Remove stuck mounts
-      #   continue-on-error: true
+        run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
+        continue-on-error: true
 
       - name: Generate build ID
         id: generating_buildid
@@ -80,7 +81,8 @@ jobs:
           artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true
           #prerelease: true
-          draft: false
+          makeLatest: true
+          #draft: true
           token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
           repo: RetroDECK-cooker
         continue-on-error: true

.github/workflows/main-selfhosted.yml

@@ -17,9 +17,10 @@ jobs:
     runs-on: self-hosted
     steps:
 
-      # - name: Remove stuck mounts
+      # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317
-      #   run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
+      - name: Remove stuck mounts
-      #   continue-on-error: true
+        run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
+        continue-on-error: true
 
       - name: Generate build ID
         id: generating_buildid
@@ -81,7 +82,8 @@ jobs:
           bodyFile: "body.md"
           artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true
-          prerelease: true
+          #prerelease: true
+          makeLatest: true
           token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
           repo: RetroDECK
         continue-on-error: true

es-configs/es_systems.xml

@@ -824,7 +824,7 @@
         <fullname>Nintendo 3DS</fullname>
         <path>%ROMPATH%/n3ds</path>
         <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
-        <command label="Citra (Standalone)">%EMULATOR_CITRA% -f %ROM%</command>
+        <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
         <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command>
         <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM%</command>
         <platform>n3ds</platform>
@@ -1619,4 +1619,4 @@
         <platform>tools</platform>
         <theme>tools</theme>
     </system>
-</systemList>
+</systemList>

net.retrodeck.retrodeck.appdata.xml

@@ -36,15 +36,15 @@
       </screenshot>
    </screenshots>
    <description>
-      <p>What is Retrodeck?
+      <p>What is Retrodeck?</p>
-  RetroDECK is an emulation and retro gaming solution to catalog and play your game collection directly from Linux in one unified application.
+      <p>RetroDECK is an emulation and retro gaming solution to catalog and play your game collection directly from Linux in one unified application.
   It's inspired by other embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera.
   RetroDECK is powered by EmulationStation Desktop Edition, that uses RetroArch and other standalone emulators to allow you to import and play your favorite games in a tidy environment.
   No other software is needed as everything it's already included in one package!</p>
       <p>BETA NOTICE: RetroDECK is still in Beta and the team is actively developing and adding more features.</p>
       <p>About the Beta:
-  The primary focus during the beta period is on SteamOS and the Steam Deck but we hope to expand to more devices and general Linux desktop in the future (NOTE: It can be run on Linux desktop right now but there will be some manual configurations needed for input, storage location and other tiny hickups).</p>
+  The primary focus during the beta period is on SteamOS and the Steam Deck but we hope to expand to more devices and general Linux desktop in the future</p>
-      <p>NOTE: Albeit RetroDECK could possibily work on every distro, it's supported only on Steam Deck.</p>
+      <p>NOTE: It can be run on Linux desktop right now but there will be some manual configurations needed for input, storage location and other tiny hickups.</p>
       <p>
          INSTALLATION INSTRUCTIONS FOR THE STEAM DECK:
          <ul>
@@ -54,18 +54,32 @@
             <li>4. [OPTIONAL] Download Steam Grids graphics for RetroDECK with BoilR</li>
          </ul>
       </p>
-      <p>For more detailed information check our wiki:
+      <p>For more detailed information check our wiki:</p>
-  https://github.com/XargonWan/RetroDECK/wiki</p>
+      <p>https://github.com/XargonWan/RetroDECK/wiki</p>
-      <p>If you want to sponsor the project:
+      <p>If you want to sponsor the project:</p>
-  https://www.patreon.com/RetroDECK</p>
+      <p>https://www.patreon.com/RetroDECK</p>
-      <p>If you want to join the RetroDECK community check our:
+      <p>If you want to join the RetroDECK community check our:</p>
-    Discord: https://discord.gg/Dz3szYsP8g
+      <p>Discord: https://discord.gg/Dz3szYsP8g</p>
-    Reddit: https://www.reddit.com/r/RetroDECK/</p>
+      <p>Reddit: https://www.reddit.com/r/RetroDECK/</p>
       <p>If you want to help out with the project join the "i-want-to-help" channel on our Discord.</p>
    </description>
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
+      <release version="0.6.3b" date="2023-03-21">
+         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url>
+         <description>
+            <ul>
+               <li>Added support support for multiple file compression via CLI.</li>
+               <li>Added support support for multiple file compression in the Configurator.</li>
+               <li>Fixed some missing layout changes.</li>
+               <li>Removed the reset tools command.</li>
+               <li>Fixed a bug in the compression tool with certain filenames with spaces.</li>
+               <li>Fixed a manifest bug that caused a conflict between Dolphin and Primehack in certain scenarios.</li>
+               <li>Shipped a new configuration to account for the config format changes made by Yuzu and Citra in the latest updates.</li>
+            </ul>
+         </description>
+      </release>
       <release version="0.6.2b" date="2023-03-15">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.2b</url>
          <description>
@@ -474,4 +488,4 @@
          </description>
       </release>
    </releases>
-</component>
+</component>

rd-submodules/retroarch

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