Merge branch 'cooker-0.6.3b-icenine451' into cooker-0.7.0b-icenine451

.github/workflows/cooker-selfhosted.yml

@@ -17,9 +17,9 @@ jobs:
     runs-on: self-hosted
     steps:
 
-      - name: Remove stuck mounts
+      # - name: Remove stuck mounts
-        run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
+      #   run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
-        continue-on-error: true
+      #   continue-on-error: true
 
       - name: Generate build ID
         id: generating_buildid
@@ -32,7 +32,7 @@ jobs:
           git pull
           git submodule init
           git submodule update
-          sudo apt install -y flatpak flatpak-builder p7zip-full
+          sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak install --user -y --noninteractive \
           org.kde.Sdk//6.3 \
@@ -47,24 +47,29 @@ jobs:
       - name: Build flatpak
         run: |
           git config --global protocol.file.allow always
+          mkdir -vp ${GITHUB_WORKSPACE}/local
+          mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
           flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
       - name: Create Artifact for flathub
         run: | 
-          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
+          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
-          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz))
+          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz))
-          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact.sha
+          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha
-          mv -f RetroDECK-Artifact.* ${{ secrets.ARTIFACT_REPO }}
+          mv -f RetroDECK-Artifact-cooker.* ${{ secrets.ARTIFACT_REPO }}
         continue-on-error: true
 
       - name: Create Bundle
         run: |
           flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
 
+      - name: Set environment variable with current branch name
+        run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
+
       - name: Publish the flatpak in a new cooker release
         uses: ncipollo/release-action@v1
         with:
-          tag: "${{ steps.generating_buildid.outputs.build-id }}"
+          tag: "${{ env.GITHUB_REF_SLUG }}-${{ steps.generating_buildid.outputs.build-id }}"
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.

.github/workflows/main-selfhosted.yml

@@ -17,9 +17,9 @@ jobs:
     runs-on: self-hosted
     steps:
 
-      - name: Remove stuck mounts
+      # - name: Remove stuck mounts
-        run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
+      #   run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
-        continue-on-error: true
+      #   continue-on-error: true
 
       - name: Generate build ID
         id: generating_buildid
@@ -32,7 +32,7 @@ jobs:
           git pull
           git submodule init
           git submodule update
-          sudo apt install -y flatpak flatpak-builder p7zip-full
+          sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak install --user -y --noninteractive \
           org.kde.Sdk//6.3 \
@@ -44,7 +44,9 @@ jobs:
 
       - name: Build flatpak
         run: |
-          git config --global protocol.allow always
+          git config --global protocol.file.allow always
+          mkdir -vp ${GITHUB_WORKSPACE}/local
+          mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
           flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
 
       - name: Create Artifact for flathub
@@ -59,19 +61,27 @@ jobs:
         run: |
           flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
 
+      - name: Getting version info
+        id: version
+        run: |
+          appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
+          REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
+          DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
+          echo "REL_VER=$REL_VER" >> $GITHUB_ENV
+          echo -e "# Release Notes\n" >> "body.md"
+          echo "$DES" >> "body.md"
+
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1
+        env:
+          REL_VER: ${{ env.REL_VER }}
         with:
-          tag: "${{ steps.generating_buildid.outputs.build-id }}"
+          tag: ${{ env.REL_VER }}
-          body: |
+          name: "RetroDECK v${{ env.REL_VER }}"
-            # Release Notes
+          bodyFile: "body.md"
-
-            ( Write release notes here )
-
           artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true
           prerelease: true
-          draft: true
           token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
           repo: RetroDECK
         continue-on-error: true

emu-configs/citra/qt-config.ini

@@ -1,10 +1,8 @@
 [Audio]
+audio_emulation=0
+audio_emulation\default=true
 enable_audio_stretching=true
 enable_audio_stretching\default=true
-enable_dsp_lle=false
-enable_dsp_lle\default=true
-enable_dsp_lle_multithread=false
-enable_dsp_lle_multithread\default=true
 mic_input_device=Default
 mic_input_device\default=true
 mic_input_type=0
@@ -39,43 +37,43 @@ camera_outer_right_name\default=true
 [Controls]
 profile=0
 profile\default=true
-profiles\1\button_a="button:0,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_a="button:0,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_a\default=false
-profiles\1\button_b="button:1,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_b="button:1,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_b\default=false
 profiles\1\button_debug="code:79,engine:keyboard"
 profiles\1\button_debug\default=true
-profiles\1\button_down="direction:down,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0"
+profiles\1\button_down="direction:down,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
 profiles\1\button_down\default=false
 profiles\1\button_gpio14="code:80,engine:keyboard"
 profiles\1\button_gpio14\default=true
-profiles\1\button_home="button:8,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_home="code:66,engine:keyboard"
-profiles\1\button_home\default=false
+profiles\1\button_home\default=true
-profiles\1\button_l="button:4,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_l="button:4,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_l\default=false
-profiles\1\button_left="direction:left,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0"
+profiles\1\button_left="direction:left,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
 profiles\1\button_left\default=false
-profiles\1\button_r="button:5,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_r="button:5,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_r\default=false
-profiles\1\button_right="direction:right,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0"
+profiles\1\button_right="direction:right,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
 profiles\1\button_right\default=false
-profiles\1\button_select="button:6,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_select="button:6,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_select\default=false
-profiles\1\button_start="button:7,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_start="button:7,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_start\default=false
-profiles\1\button_up="direction:up,engine:sdl,guid:03000000de280000ff11000001000000,hat:0,port:0"
+profiles\1\button_up="direction:up,engine:sdl,guid:030079f6de280000ff11000001000000,hat:0,port:0"
 profiles\1\button_up\default=false
-profiles\1\button_x="button:2,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_x="button:2,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_x\default=false
-profiles\1\button_y="button:3,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\button_y="button:3,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\button_y\default=false
-profiles\1\button_zl="axis:3,direction:-,engine:sdl,guid:03000000de280000ff11000001000000,port:0,threshold:-0.5"
+profiles\1\button_zl="axis:2,direction:+,engine:sdl,guid:030079f6de280000ff11000001000000,port:0,threshold:0.5"
 profiles\1\button_zl\default=false
-profiles\1\button_zr="axis:5,direction:+,engine:sdl,guid:03000000de280000ff11000001000000,port:0,threshold:0.5"
+profiles\1\button_zr="axis:5,direction:+,engine:sdl,guid:030079f6de280000ff11000001000000,port:0,threshold:0.5"
 profiles\1\button_zr\default=false
-profiles\1\c_stick="axis_x:3,axis_y:4,deadzone:0.100000,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\c_stick="axis_x:3,axis_y:4,deadzone:0.100000,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\c_stick\default=false
-profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:03000000de280000ff11000001000000,port:0"
+profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:030079f6de280000ff11000001000000,port:0"
 profiles\1\circle_pad\default=false
 profiles\1\motion_device="engine:motion_emu,update_period:100,sensitivity:0.01,tilt_clamp:90.0"
 profiles\1\motion_device\default=true
@@ -106,10 +104,12 @@ use_cpu_jit=true
 use_cpu_jit\default=true
 
 [Data%20Storage]
-nand_directory=~/retrodeck/saves/n3ds/citra/nand/
+nand_directory=/home/deck/retrodeck/saves/n3ds/citra/nand/
 nand_directory\default=false
-sdmc_directory=~/retrodeck/saves/n3ds/citra/sdmc/
+sdmc_directory=/home/deck/retrodeck/saves/n3ds/citra/sdmc/
 sdmc_directory\default=false
+use_custom_storage=true
+use_custom_storage\default=false
 use_virtual_sd=true
 use_virtual_sd\default=true
 
@@ -178,6 +178,8 @@ LLE\NWM=false
 LLE\NWM\default=true
 LLE\PDN=false
 LLE\PDN\default=true
+LLE\PLGLDR=false
+LLE\PLGLDR\default=true
 LLE\PM=false
 LLE\PM\default=true
 LLE\PS=false
@@ -194,36 +196,43 @@ LLE\SPI=false
 LLE\SPI\default=true
 LLE\SSL=false
 LLE\SSL\default=true
-gdbstub_port=24689
+gdbstub_port=@Variant(\0\0\0\x85`q)
 gdbstub_port\default=true
 record_frame_times=false
 use_gdbstub=false
 use_gdbstub\default=true
 
 [Layout]
-custom_bottom_bottom=480
+custom_bottom_bottom=@Variant(\0\0\0\x85\x1\xe0)
 custom_bottom_bottom\default=true
-custom_bottom_left=40
+custom_bottom_left=@Variant(\0\0\0\x85\0()
 custom_bottom_left\default=true
-custom_bottom_right=360
+custom_bottom_right=@Variant(\0\0\0\x85\x1h)
 custom_bottom_right\default=true
-custom_bottom_top=240
+custom_bottom_top=@Variant(\0\0\0\x85\0\xf0)
 custom_bottom_top\default=true
 custom_layout=false
 custom_layout\default=true
-custom_top_bottom=240
+custom_second_layer_opacity=@Variant(\0\0\0\x85\0\x64)
+custom_second_layer_opacity\default=true
+custom_top_bottom=@Variant(\0\0\0\x85\0\xf0)
 custom_top_bottom\default=true
-custom_top_left=0
+custom_top_left=@Variant(\0\0\0\x85\0\0)
 custom_top_left\default=true
-custom_top_right=400
+custom_top_right=@Variant(\0\0\0\x85\x1\x90)
 custom_top_right\default=true
-custom_top_top=0
+custom_top_top=@Variant(\0\0\0\x85\0\0)
 custom_top_top\default=true
 factor_3d=0
 factor_3d\default=true
 filter_mode=true
 filter_mode\default=true
+large_screen_proportion=@Variant(\0\0\0\x87@\x80\0\0)
+large_screen_proportion\default=true
 layout_option=0
+layout_option\default=true
+mono_render_option=0
+mono_render_option\default=true
 pp_shader_name=none (builtin)
 pp_shader_name\default=true
 render_3d=0
@@ -244,20 +253,16 @@ bg_green=0
 bg_green\default=true
 bg_red=0
 bg_red\default=true
-frame_limit=100
+frame_limit=@Variant(\0\0\0\x85\0\x64)
 frame_limit\default=true
-frame_limit_alternate=200
+resolution_factor=@Variant(\0\0\0\x85\0\x1)
-frame_limit_alternate\default=true
-resolution_factor=1
 resolution_factor\default=true
 shaders_accurate_mul=true
 shaders_accurate_mul\default=true
-texture_filter_name=none
+texture_filter_name=Linear (Default)
-texture_filter_name\default=true
+texture_filter_name\default=false
 use_disk_shader_cache=true
 use_disk_shader_cache\default=true
-use_frame_limit_alternate=false
-use_frame_limit_alternate\default=true
 use_hw_renderer=true
 use_hw_renderer\default=true
 use_hw_shader=true
@@ -268,12 +273,18 @@ use_vsync_new=true
 use_vsync_new\default=true
 
 [System]
+allow_plugin_loader=true
+allow_plugin_loader\default=true
 init_clock=0
 init_clock\default=true
-init_time=946681277
+init_time=@Variant(\0\0\0\x84\0\0\0\0\x38m5\xbd)
 init_time\default=true
+init_time_offset=@Variant(\0\0\0\x81\0\0\0\0\0\0\0\0)
+init_time_offset\default=true
 is_new_3ds=true
 is_new_3ds\default=true
+plugin_loader=false
+plugin_loader\default=true
 region_value=-1
 region_value\default=true
 
@@ -330,16 +341,17 @@ Paths\language=en
 Paths\language\default=false
 Paths\moviePlaybackPath=
 Paths\movieRecordPath=
-Paths\recentFiles=
+Paths\recentFiles=@Invalid()
-Paths\romsPath=/home/deck/retrodeck/roms/n3ds
+Paths\romsPath=
-Paths\screenshotPath=
+Paths\screenshotPath=/home/deck/retrodeck/screenshots
+Paths\screenshotPath\default=false
 Paths\symbolsPath=
 Paths\videoDumpingPath=
-Shortcuts\Main%20Window\Advance%20Frame\Context=2
+Shortcuts\Main%20Window\Advance%20Frame\Context=1
-Shortcuts\Main%20Window\Advance%20Frame\Context\default=true
+Shortcuts\Main%20Window\Advance%20Frame\Context\default=false
-Shortcuts\Main%20Window\Advance%20Frame\KeySeq=\\
+Shortcuts\Main%20Window\Advance%20Frame\KeySeq=
 Shortcuts\Main%20Window\Advance%20Frame\KeySeq\default=true
-Shortcuts\Main%20Window\Capture%20Screenshot\Context=2
+Shortcuts\Main%20Window\Capture%20Screenshot\Context=3
 Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true
 Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P
 Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true
@@ -347,6 +359,10 @@ Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Decrease%203D%20Factor\Context=2
+Shortcuts\Main%20Window\Decrease%203D%20Factor\Context\default=true
+Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq=Ctrl+-
+Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq\default=true
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context=2
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context\default=true
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=-
@@ -357,21 +373,25 @@ Shortcuts\Main%20Window\Exit%20Citra\KeySeq=T
 Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=false
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true
-Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc
+Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Y
-Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=false
 Shortcuts\Main%20Window\Fullscreen\Context=1
 Shortcuts\Main%20Window\Fullscreen\Context\default=true
 Shortcuts\Main%20Window\Fullscreen\KeySeq=F11
 Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true
+Shortcuts\Main%20Window\Increase%203D%20Factor\Context=2
+Shortcuts\Main%20Window\Increase%203D%20Factor\Context\default=true
+Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq=Ctrl++
+Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq\default=true
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context=2
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context\default=true
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=+
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=true
-Shortcuts\Main%20Window\Load%20Amiibo\Context=2
+Shortcuts\Main%20Window\Load%20Amiibo\Context=3
 Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true
 Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=F2
 Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=true
-Shortcuts\Main%20Window\Load%20File\Context=1
+Shortcuts\Main%20Window\Load%20File\Context=3
 Shortcuts\Main%20Window\Load%20File\Context\default=true
 Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O
 Shortcuts\Main%20Window\Load%20File\KeySeq\default=true
@@ -379,6 +399,10 @@ Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context=1
 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context\default=true
 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=R
 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq\default=false
+Shortcuts\Main%20Window\Mute%20Audio\Context=1
+Shortcuts\Main%20Window\Mute%20Audio\Context\default=true
+Shortcuts\Main%20Window\Mute%20Audio\KeySeq=Ctrl+M
+Shortcuts\Main%20Window\Mute%20Audio\KeySeq\default=true
 Shortcuts\Main%20Window\Remove%20Amiibo\Context=2
 Shortcuts\Main%20Window\Remove%20Amiibo\Context\default=true
 Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq=F3
@@ -401,20 +425,24 @@ Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5
 Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true
 Shortcuts\Main%20Window\Swap%20Screens\Context=1
 Shortcuts\Main%20Window\Swap%20Screens\Context\default=true
-Shortcuts\Main%20Window\Swap%20Screens\KeySeq=Y
+Shortcuts\Main%20Window\Swap%20Screens\KeySeq=F9
-Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=false
+Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=true
-Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context=2
+Shortcuts\Main%20Window\Toggle%203D\Context=2
-Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context\default=true
+Shortcuts\Main%20Window\Toggle%203D\Context\default=true
-Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq=Ctrl+Z
+Shortcuts\Main%20Window\Toggle%203D\KeySeq=Ctrl+3
-Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%203D\KeySeq\default=true
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1
-Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=true
+Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=false
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F
-Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=2
-Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=true
+Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=false
 Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq=Ctrl+A
-Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=false
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context=2
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context\default=true
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq=Ctrl+Z
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=F10
@@ -423,17 +451,17 @@ Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true
-Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=2
+Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=1
-Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=true
+Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=false
-Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq=Ctrl+D
+Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq=
 Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq\default=true
-UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x5\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x4\x9c\0\0\0\x5\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x5\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\xf0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64)
+UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x5\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x4 \0\0\0\x5\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x5\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0t\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64)
-UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\xd6\0\0\0\x97\0\0\x4*\0\0\x2\x43\0\0\0\xd6\0\0\0\xb4\0\0\x4*\0\0\x2\x43\0\0\0\0\0\0\0\0\x5\0\0\0\0\xd6\0\0\0\xb4\0\0\x4*\0\0\x2\x43)
+UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4\x1f\0\0\x1\x8f\0\0\0\0\0\0\0\0\0\0\x4\x1f\0\0\x1\x8f\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\0\0\0\x4\x1f\0\0\x1\x8f)
-UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x1\x8f\0\0\x1\xf3)
+UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31)
-UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k)
+UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x4\xfd\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k)
 UILayout\microProfileDialogVisible=false
 UILayout\microProfileDialogVisible\default=true
-UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0n\x1\0\0\x3\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x94\x1\0\0\x3\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x94\x1\0\0\x3\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xd2\x1\0\0\x3\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0N\x1\0\0\x3\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x62\x1\0\0\x3\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xd3\x1\0\0\x3\0\0\x3U\0\0\x1Q\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0h\0\xff\xff\xff\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x87\0\xff\xff\xff\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x87\0\xff\xff\xff\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xaa\0\xff\xff\xff\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x41\0\xff\xff\xff\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xc3\0\xff\xff\xff\0\0\x4 \0\0\x1^\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
 Updater\check_for_update_on_start=true
 Updater\check_for_update_on_start\default=true
 Updater\update_on_close=false
@@ -448,13 +476,13 @@ enable_discord_presence=true
 enable_discord_presence\default=true
 firstStart=false
 firstStart\default=false
-fullscreen=true
+fullscreen=false
 fullscreen\default=true
 hideInactiveMouse=false
 hideInactiveMouse\default=true
-pauseWhenInBackground=true
+pauseWhenInBackground=false
 pauseWhenInBackground\default=true
-screenshot_resolution_factor=0
+screenshot_resolution_factor=@Variant(\0\0\0\x85\0\0)
 screenshot_resolution_factor\default=true
 showConsole=false
 showConsole\default=true
@@ -494,7 +522,7 @@ video_encoder_options\default=true
 
 [WebService]
 citra_token=
-citra_username=
+citra_username=RetroDECK
 enable_telemetry=false
 enable_telemetry\default=false
 web_api_url=https://api.citra-emu.org

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% %ROM%</command>
+        <command label="Citra (Standalone)">%EMULATOR_CITRA% -f %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>

es-configs/tools-gamelist.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <gameList>
 	<game>
-		<path>./configurator.sh</path>
+		<path>/app/bin/configurator.sh</path>
 		<name>RetroDECK Configurator</name>
 		<desc>Change settings, move folders and more!</desc>
 		<nogamecount>true</nogamecount>

functions.sh

@@ -1015,7 +1015,7 @@ citra_init() {
   mkdir -pv "$rdhome/saves/n3ds/citra/sdmc/"
   dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata"
   dir_prep "$rdhome/.logs/citra" "/var/data/citra-emu/log"
-  cp -fv $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini
+  cp -fv $emuconfigs/citra/qt-config.ini /var/config/citra-emu/qt-config.ini
   sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini
   dir_prep "$mods_folder/Citra" "/var/data/citra-emu/load/mods/"
   dir_prep "$texture_packs_folder/Citra" "/var/data/citra-emu/load/textures/"

net.retrodeck.retrodeck.appdata.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2022 Xargon <xargonwan@gmail.com> -->
+<!-- Copyright 2022 Xargon <xargonwan@gmail.com> and the RetroDECK Team-->
 <component type="desktop-application">
    <id>net.retrodeck.retrodeck</id>
    <launchable type="desktop-id">net.retrodeck.retrodeck.desktop</launchable>
    <name>RetroDECK</name>
-  <summary>Everything you need for emulation on Steam Deck</summary>
+   <summary>Your one in all application for emulation and retro gaming on the Steam Deck and more!</summary>
-  <developer_name>Xargon</developer_name>
+   <developer_name>RetroDECK Team</developer_name>
    <url type="homepage">https://retrodeck.net</url>
    <url type="bugtracker">https://github.com/XargonWan/RetroDECK/issues</url>
    <url type="help">http://discord.gg/Dz3szYsP8g</url>
@@ -36,40 +36,37 @@
       </screenshot>
    </screenshots>
    <description>
+      <p>What is Retrodeck?
+  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>
+      <p>NOTE: Albeit RetroDECK could possibily work on every distro, it's supported only on Steam Deck.</p>
       <p>
-	RetroDECK brings an environment to catalog and play your retro games directly from SteamOS and it's tailored specifically for the Steam Deck.
+         INSTALLATION INSTRUCTIONS FOR THE STEAM DECK:
-	It's inspired by embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera.</p>
-	<p>
-	Powered by EmulationStation Desktop Edition, which uses RetroArch and other standalone emulators to allow you to import and play your favorite retro (and even not-so-retro) games in a tidy environment without flooding your Steam library.
-	No other software is needed as everything it's already included!</p>
-  <p>
-  NOTE: Albeit RetroDECK could possibily work on every distro, it's supported only on Steam Deck.</p>
-
-  <p>INSTALLATION INSTRUCTIONS:</p>
          <ul>
-    <li>Start RetroDECK from the Desktop mode (first time only)</li>
+            <li>1. Start RetroDECK from the Desktop mode (only needed for the initial first time configuration)</li>
-    <li>Follow the setup (read carefully!)</li>
+            <li>2. Add RetroDECK to your Steam Library by pressing "Add a non-steam game to my library"</li>
-    <li>Add RetroDECK to your Steam Library</li>
+            <li>3. Download the offical RetroDECK controller profile from Steam</li>
-    <li>[OPTIONAL] Download Steam Grids with BoilR</li>
+            <li>4. [OPTIONAL] Download Steam Grids graphics for RetroDECK with BoilR</li>
-    <li>Always start RetroDECK from Steam Library</li>
          </ul>
-  <p>For a better experience is suggested to use the official Steam Controller Config available under community configs in Steam</p>
+      </p>
-
+      <p>For more detailed information check our wiki:
-  <p>Known Issues:</p>
+  https://github.com/XargonWan/RetroDECK/wiki</p>
-    <ul>
+      <p>If you want to sponsor the project:
-      <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
+  https://www.patreon.com/RetroDECK</p>
-      <li>As of this moment external controllers, local multiplayer in gamemode are not supported. Neither is running RetroDECK in desktop mode, we plan on adding the functionality in the future</li>
+      <p>If you want to join the RetroDECK community check our:
-    </ul>
+    Discord: https://discord.gg/Dz3szYsP8g
-
+    Reddit: https://www.reddit.com/r/RetroDECK/</p>
-    IMPORTANT NOTE:
+      <p>If you want to help out with the project join the "i-want-to-help" channel on our Discord.</p>
-    At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs.
    </description>
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
-
+   <releases>
-<releases>
+      <release version="0.6.2b" date="2023-03-15">
-
-  <release version="0.6.2b" date="2023-03-14">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.2b</url>
          <description>
             <ul>
@@ -85,13 +82,14 @@
                <li>Added tool to check for common multi-file game structure issues</li>
                <li>Fixed Primehack initial configuration as it was broken (will automatically reset the emulator just this once)</li>
                <li>Fixed Duckstation initial configuration as it was broken (will require user-performed reset just this once)</li>
+               <li>Fixed Pico-8 initial configuration as it was broken.</li>
+               <li>Fixed Pico-8 dual bios folders. The program files pico8_dyn,pico8.dat and pico8 have to be manually moved to the correct location~/retrodeck/bios/pico-8/. The old ~/retrodeck/bios/pico8/ is renamed ~/retrodeck/bios/pico8_olddata/ to avoid confusion on where to put files. After the files have moved the pico8_olddata folder can be deleted.</li>
                <li>Fixed a bug that made the Dolphin RetroArch core not working properly (the standalone version of Dolphin always worked and is the default)</li>
                <li>Various backend fixes</li>
                <li>Updated all Emulators, RetroArch and libreretro cores. (PLEASE NOTE! ES-DE was not updated to version 2.0, this will be done in the next version of RetroDECK as we need more time to work on the new theme format).</li>
             </ul>
          </description>
       </release>
-
       <release version="0.6.1b" date="2023-02-21">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.1b</url>
          <description>
@@ -106,12 +104,11 @@
                <li>Fixed Primehack preconfiguration and Configurator entry</li>
                <li>Fixed a bug where the hidden files were not moved during the directory preparation</li>
                <li>Fixed a bug where the symlinks were recursively placed inside the prepeared paths</li>
-          <li>Fixed issue with missing symlink after RetroDECK base directory was moved somewhere else></li>
+               <li>Fixed issue with missing symlink after RetroDECK base directory was moved somewhere else&gt;</li>
                <li>Fixed Duckstation preconfiguration</li>
             </ul>
          </description>
       </release>
-
       <release version="0.6.0b" date="2022-12-24">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.0b</url>
          <description>
@@ -137,7 +134,6 @@
             </ul>
          </description>
       </release>
-
       <release version="0.5.3b" date="2022-10-26">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.3b</url>
          <description>
@@ -155,8 +151,7 @@
             </ul>
          </description>
       </release>
-
+      <release version="0.5.2b" date="2022-10-13">
-<release version="0.5.2b" date="2022-10-13">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.2b</url>
          <description>
             <ul>
@@ -166,9 +161,8 @@
                <li>Fixed the Rewind tool</li>
             </ul>
          </description>
-</release>
+      </release>
-
+      <release version="0.5.1b" date="2022-10-12">
-<release version="0.5.1b" date="2022-10-12">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.1b</url>
          <description>
             <ul>
@@ -189,9 +183,8 @@
                <li>And more, for the complete patch notes please check the wiki...</li>
             </ul>
          </description>
-</release>
+      </release>
-
+      <release version="0.5.0b" date="2022-10-11">
-<release version="0.5.0b" date="2022-10-11">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.0b</url>
          <description>
             <ul>
@@ -210,32 +203,28 @@
                <li>And more, for the complete patch notes please check the wiki...</li>
             </ul>
          </description>
-</release>
+      </release>
-    
+      <release version="0.4.5b" date="2022-07-20">
-<release version="0.4.5b" date="2022-07-20">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.5b</url>
          <description>
             <ul>
                <li>Fixed a bug where new symlinks were not created correctly and users couldn't scrape their games</li>
             </ul>
-
             <p>Known Issues:</p>
             <ul>
-          <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
+               <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -&gt; PCSX2 -&gt; (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
                <li>Due to a Steam limitation, external controllers and keyboard seems not to be working, expecially in the desktop mode</li>
             </ul>
-
             IMPORTANT NOTE:
         At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs.
          </description>
       </release>
-
       <release version="0.4.4b" date="2022-07-18">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.4b</url>
          <description>
             <ul>
                <li>Yuzu: Disabled shader caching as it was broken</li>
-          <li>Yuzu: Switched from vulkan to opengl as vulkan is experimental and it's not working correctly for the games majority, you can set vulkan by opening tuzu from Tools -> Start Yuzu</li>
+               <li>Yuzu: Switched from vulkan to opengl as vulkan is experimental and it's not working correctly for the games majority, you can set vulkan by opening tuzu from Tools -&gt; Start Yuzu</li>
                <li>Yuzu: Edited Hotkeys (see wiki)</li>
                <li>Yuzu: Increased performances</li>
                <li>Yuzu: Fixed graphics and scaling</li>
@@ -246,110 +235,117 @@
                <li>Backend: Moved the lockfile in the internal folders</li>
                <li>Backend: General code cleanup.</li>
             </ul>
-
             <p>Known Issues:</p>
             <ul>
-          <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
+               <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -&gt; PCSX2 -&gt; (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
                <li>Due to a Steam limitation, external controllers and keyboard seems not to be working, expecially in the desktop mode</li>
             </ul>
-
             IMPORTANT NOTE:
         At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs.
          </description>
       </release>
-
       <release version="0.4.3b" date="2022-07-07">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.3b</url>
          <description>
-        <p><b>Emulators:</b></p>
+            <p>
+               <b>Emulators:</b>
+            </p>
             <ul>
                <li>Updated all the emulators at the latest available version.</li>
             </ul>
-
+            <p>
-        <p><b>Backend:</b></p>
+               <b>Backend:</b>
+            </p>
             <ul>
                <li>Manifest code cleanup.</li>
             </ul>
-
+            <p>
-        <p><b>Known Issues:</b></p>
+               <b>Known Issues:</b>
+            </p>
             <ul>
-          <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
+               <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -&gt; PCSX2 -&gt; (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
                <li>Due to a Steam limitation, external controllers and keyboard seems not to be working, expecially in the desktop mode</li>
             </ul>
-
+            <p>
-        <p><b>IMPORTANT NOTE:</b>
+               <b>IMPORTANT NOTE:</b>
                At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs.
             </p>
          </description>
       </release>
-
       <release version="0.4.2b" date="2022-07-01">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.2b</url>
          <description>
-        <p><b>Emulators:</b></p>
+            <p>
+               <b>Emulators:</b>
+            </p>
             <ul>
                <li>Updated all the emulators at the latest available version.</li>
-          <li>DOLPHIN (SA): Fixed a bug where Dolphin couldn't be properly configured. If it's still misconfigured please run `flatpak run net.retrodeck.retrodeck --reset-sa` in order to reset all the standalone emulators, including Dolphin. </li>
+               <li>DOLPHIN (SA): Fixed a bug where Dolphin couldn't be properly configured. If it's still misconfigured please run `flatpak run net.retrodeck.retrodeck --reset-sa` in order to reset all the standalone emulators, including Dolphin.</li>
-          <li>CITRA (SA): Reconfigured controls and hotkeys. </li>
+               <li>CITRA (SA): Reconfigured controls and hotkeys.</li>
-          <li>MELONDS (SA): Reconfigured controls. </li>
+               <li>MELONDS (SA): Reconfigured controls.</li>
-          <li>GAMBATTE (LIBRETRO): Added GB colorization. </li>
+               <li>GAMBATTE (LIBRETRO): Added GB colorization.</li>
-          <li>RETROARCH (LIBRETRO): Tweaked some configs and fixed some overlapping hotkeys (FPS was same as Show Menu action). </li>
+               <li>RETROARCH (LIBRETRO): Tweaked some configs and fixed some overlapping hotkeys (FPS was same as Show Menu action).</li>
             </ul>
-
+            <p>
-        <p><b>Backend:</b></p>
+               <b>Backend:</b>
+            </p>
             <ul>
-          <li>Removed some broken tools that will be reintroduced once fixed, including the roms moving tool. </li>
+               <li>Removed some broken tools that will be reintroduced once fixed, including the roms moving tool.</li>
-          <li>Updated ES-DE configs (es_find_rules, es_settings, es_systems). </li>
+               <li>Updated ES-DE configs (es_find_rules, es_settings, es_systems).</li>
-          <li>Manifest trimmend and general code cleanup. </li>
+               <li>Manifest trimmend and general code cleanup.</li>
             </ul>
-
+            <p>
-        <p><b>Known Issues:</b></p>
+               <b>Known Issues:</b>
+            </p>
             <ul>
-          <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
+               <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -&gt; PCSX2 -&gt; (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
                <li>Due to a Steam limitation, external controllers and keyboard seems not to be working, expecially in the desktop mode</li>
             </ul>
-
+            <p>
-        <p><b>IMPORTANT NOTE:</b>
+               <b>IMPORTANT NOTE:</b>
                At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs.
             </p>
          </description>
       </release>
-
       <release version="0.4.1b" date="2022-05-11">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.1b</url>
          <description>
-        <p><b>Emulators:</b></p>
+            <p>
+               <b>Emulators:</b>
+            </p>
             <ul>
                <li>Tweaked various emulator configs</li>
                <li>The emulators that was showing a small viewport like N64, Wii, GC, and Dreamcast are now showing a more appropriate viewport</li>
                <li>Fixed home path in MelonDS (SA)</li>
             </ul>
-
+            <p>
-        <p><b>Frontend:</b></p>
+               <b>Frontend:</b>
+            </p>
             <ul>
                <li>Updated ES-DE to 1.2.4</li>
                <li>RetroDECK doesn't open ES-DE anymore during the first setup, almost everything is now automated: HURRAY!</li>
                <li>Now a custom roms path can be selected if SD Card is selected and the SD Card is not found in the default path</li>
             </ul>
-
+            <p>
-        <p><b>Backend:</b></p>
+               <b>Backend:</b>
+            </p>
             <ul>
                <li>Fixed a bug where the folders where not symlinked correclty</li>
             </ul>
-
+            <p>
-        <p><b>Known Issues:</b></p>
+               <b>Known Issues:</b>
+            </p>
             <ul>
-          <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
+               <li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -&gt; PCSX2 -&gt; (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
                <li>External controllers and keyboard seems not to be working, expecially in the desktop mode</li>
                <li>Yuzu makes RetroDECK freeze in some situations, like if the rom is a bad dump</li>
             </ul>
-
+            <p>
-        <p><b>IMPORTANT NOTE:</b>
+               <b>IMPORTANT NOTE:</b>
                At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs.
             </p>
          </description>
       </release>
-
       <release version="0.4.0b" date="2022-05-26">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.0b</url>
          <description>
@@ -403,13 +399,10 @@
                <li>External controllers seems not to be working</li>
                <li>Yuzu makes RetroDECK freeze in some situations, like if the rom is a bad dump</li>
             </ul>
-        <p>
+            <p>IMPORTANT NOTE:
-          IMPORTANT NOTE:
+          At the moment the emulator configs are reset during every update, this was made because every version may bring new configurations, please back them up if you did some manual configs.</p>
-          At the moment the emulator configs are reset during every update, this was made because every version may bring new configurations, please back them up if you did some manual configs.
-        </p>
          </description>
       </release>
-  
       <release version="0.3.1b" date="2022-04-26">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.3.1b</url>
          <description>
@@ -438,7 +431,6 @@
             </ul>
          </description>
       </release>
-	
       <release version="0.2.0b" date="2022-04-17">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.2.0b</url>
          <description>
@@ -455,7 +447,6 @@
             </ul>
          </description>
       </release>
-	
       <release version="0.1.1b" date="2022-04-03">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.1.1b</url>
          <description>
@@ -468,7 +459,6 @@
             </ul>
          </description>
       </release>
-	
       <release version="0.1.0b" date="2022-04-03">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.1.0b</url>
          <description>
@@ -483,6 +473,5 @@
             </ul>
          </description>
       </release>
-	
    </releases>
 </component>

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
+  # [X] Update the VERSION variable
-  # [ ] Update the appdata.xml with the version number and notes
+  # [X] Update the appdata.xml with the version number and notes
-  # [ ] change branch into main in version-initialization (first one)
+  # [X] change branch into main in version-initialization (first one)
-  # [ ] change branch into main in retrodeck module (last one)
+  # [X] change branch into main in retrodeck module (last one)
-  # [ ] if header (before modules) was edited, edit it even in flathub.yml
+  # [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.2b"
+        VERSION="cooker-0.6.3b"
         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.2b
+        branch: cooker-0.6.3b
 
   - name: xmlstarlet
     config-opts:
@@ -426,7 +426,7 @@ modules:
     sources:
       - type: archive
         url: https://buildbot.libretro.com/stable/1.15.0/linux/x86_64/RetroArch_cores.7z
-        sha256: 1fdec5c2cbabea4f194ede4a1fb0dd1d17e14e64bf7ef705e3ad763592411073
+        sha256: 2230bc38eaf87406efd0c2b7bdd1cf9e813ba113505600f14a7ef9eb06f8c7c0
 
   # PPSSPP - START
   # https://github.com/flathub/org.ppsspp.PPSSPP
@@ -637,7 +637,9 @@ modules:
       - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
     sources:
       - type: git
-        #url: ssh://git@github.com/dolphin-emu/dolphin.git
+        # Sometimes Dolphin or its submodules clone are failing in https so it must done in ssh
+        # fatal: remote transport reported error
+        # url: ssh://git@github.com/dolphin-emu/dolphin.git
         url: https://github.com/dolphin-emu/dolphin.git
         commit: 46b99671d9158e0ca840c1d8ef249db0f321ced7
         x-checker-data:
@@ -856,8 +858,8 @@ modules:
       - install -D primehack-wrapper /app/bin/primehack-wrapper
     sources:
       - type: git
-        url: https://github.com/shiiion/dolphin.git
+        url: https://github.com/TheDrifter363/primehack.git
-        commit: efb99ebfd20b1bc16ea3e51fec409c91e354d8c2
+        commit: 6295c695307a67f11ee202b05cbdd7b5c1edae5c
        # detects whether dolphin is running in a flatpak sandbox
        # and makes it use xdg directories if it is.
        # prevents dolphin from attempting to write conf files
@@ -1067,12 +1069,13 @@ modules:
       - cp -f res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg
 
       # Tools
-      - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/
-      - cp tools/* ${FLATPAK_DEST}/retrodeck/tools/
       - mv -f es-configs/tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/
 
+      # Launchable scripts
       - cp retrodeck.sh /app/bin/retrodeck.sh
       - chmod +x /app/bin/retrodeck.sh
+      - cp tools/configurator.sh /app/bin/configurator.sh
+      - chmod +x /app/bin/configurator.sh
 
       # Function libraries
       - mkdir -p /app/libexec
@@ -1098,4 +1101,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.2b
+        branch: cooker-0.6.3b

retrodeck.sh

@@ -45,7 +45,7 @@ https://retrodeck.net
       exit
       ;;
     --configurator*)
-      sh /var/config/retrodeck/tools/configurator.sh
+      sh /app/bin/configurator.sh
       exit
       ;;
     --reset-emulator*)
@@ -53,7 +53,7 @@ https://retrodeck.net
       echo "Available options are: retroarch citra dolphin duckstation melonds pcsx2 ppsspp primehack rpcs3 xemu yuzu all-emulators"
       read -p "Please enter the emulator you would like to reset: " emulator
       if [[ "$emulator" =~ ^(retroarch|citra|dolphin|duckstation|melonds|pcsx2|ppsspp|primehack|rpcs3|xemu|yuzu|all-emulators)$ ]]; then
-        read -p "You are about to reset $emulator to default settings. Press 'y' to continue, 'n' to stop: " response
+        read -p "You are about to reset $emulator to default settings. Enter 'y' to continue, 'n' to stop: " response
         if [[ $response == [yY] ]]; then
           cli_emulator_reset $emulator
           read -p "The process has been completed, press Enter key to start RetroDECK."
@@ -69,7 +69,7 @@ https://retrodeck.net
       ;;
     --reset-tools*)
       echo "You are about to reset the RetroDECK tools."
-      read -p "Press 'y' to continue, 'n' to stop: " response
+      read -p "Enter 'y' to continue, 'n' to stop: " response
       if [[ $response == [yY] ]]; then
         tools_init
         read -p "The process has been completed, press Enter key to start RetroDECK."
@@ -81,9 +81,10 @@ https://retrodeck.net
       ;;
     --reset-retrodeck*)
       echo "You are about to reset RetroDECK completely!"
-      read -p "Press 'y' to continue, 'n' to stop: " response
+      read -p "Enter 'y' to continue, 'n' to stop: " response
       if [[ $response == [yY] ]]; then
         rm -f "$lockfile"
+        rm -f "$rd_conf"
         read -p "The process has been completed, press Enter key to start the initial RetroDECK setup process."
         shift # Continue launch after previous command is finished
       else

tools/configurator.sh

@@ -174,8 +174,9 @@ configurator_reset_dialog() {
   zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
   --title "RetroDECK Configurator Utility - Reset RetroDECK" \
-  --text="You are resetting RetroDECK to its default state.\n\nAfter the process is complete you will need to exit RetroDECK and run it again, where you will go through the initial setup process again."
+  --text="You are resetting RetroDECK to its default state.\n\nAfter the process is complete you will need to exit RetroDECK and run it again, where you will go through the initial setup process."
   rm -f "$lockfile"
+  rm -f "$rd_conf"
   configurator_process_complete_dialog "resetting RetroDECK"
 ;;
 
@@ -349,7 +350,7 @@ configurator_retroarch_options_dialog() {
   ;;
 
   "" ) # No selection made or Back button clicked
-    configurator_options_dialog
+    configurator_welcome_dialog
   ;;
 
   esac