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

This commit is contained in:
icenine451 2023-03-20 15:34:15 -04:00
commit 5b92ca50f6
5 changed files with 512 additions and 510 deletions

View file

@ -17,9 +17,9 @@ jobs:
runs-on: self-hosted
steps:
- name: Remove stuck mounts
run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
continue-on-error: true
# - name: Remove stuck mounts
# run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
# 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 \
@ -61,10 +61,13 @@ jobs:
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}}.

View file

@ -17,9 +17,9 @@ jobs:
runs-on: self-hosted
steps:
- name: Remove stuck mounts
run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
continue-on-error: true
# - name: Remove stuck mounts
# run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
# 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 \
@ -59,19 +59,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 }}"
body: |
# Release Notes
( Write release notes here )
tag: ${{ env.REL_VER }}
name: "RetroDECK v${{ env.REL_VER }}"
bodyFile: "body.md"
artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
allowUpdates: true
prerelease: true
draft: true
token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
repo: RetroDECK
continue-on-error: true

View file

@ -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>
<developer_name>Xargon</developer_name>
<summary>Your one in all application for emulation and retro gaming on the Steam Deck and more!</summary>
<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.
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>
INSTALLATION INSTRUCTIONS FOR THE STEAM DECK:
<ul>
<li>Start RetroDECK from the Desktop mode (first time only)</li>
<li>Follow the setup (read carefully!)</li>
<li>Add RetroDECK to your Steam Library</li>
<li>[OPTIONAL] Download Steam Grids with BoilR</li>
<li>Always start RetroDECK from Steam Library</li>
<li>1. Start RetroDECK from the Desktop mode (only needed for the initial first time configuration)</li>
<li>2. Add RetroDECK to your Steam Library by pressing "Add a non-steam game to my library"</li>
<li>3. Download the offical RetroDECK controller profile from Steam</li>
<li>4. [OPTIONAL] Download Steam Grids graphics for RetroDECK with BoilR</li>
</ul>
<p>For a better experience is suggested to use the official Steam Controller Config available under community configs in Steam</p>
<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>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>
</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.
</p>
<p>For more detailed information check our wiki:
https://github.com/XargonWan/RetroDECK/wiki</p>
<p>If you want to sponsor the project:
https://www.patreon.com/RetroDECK</p>
<p>If you want to join the RetroDECK community check our:
Discord: https://discord.gg/Dz3szYsP8g
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.2b" date="2023-03-14">
<release version="0.6.2b" date="2023-03-15">
<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,7 +151,6 @@
</ul>
</description>
</release>
<release version="0.5.2b" date="2022-10-13">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.2b</url>
<description>
@ -167,7 +162,6 @@
</ul>
</description>
</release>
<release version="0.5.1b" date="2022-10-12">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.1b</url>
<description>
@ -190,7 +184,6 @@
</ul>
</description>
</release>
<release version="0.5.0b" date="2022-10-11">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.0b</url>
<description>
@ -211,31 +204,27 @@
</ul>
</description>
</release>
<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,47 +235,49 @@
<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><b>Backend:</b></p>
<p>
<b>Backend:</b>
</p>
<ul>
<li>Manifest code cleanup.</li>
</ul>
<p><b>Known Issues:</b></p>
<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><b>IMPORTANT NOTE:</b>
<p>
<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>
@ -295,61 +286,66 @@
<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>
</ul>
<p><b>Backend:</b></p>
<p>
<b>Backend:</b>
</p>
<ul>
<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>Manifest trimmend and general code cleanup.</li>
</ul>
<p><b>Known Issues:</b></p>
<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><b>IMPORTANT NOTE:</b>
<p>
<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><b>Frontend:</b></p>
<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><b>Backend:</b></p>
<p>
<b>Backend:</b>
</p>
<ul>
<li>Fixed a bug where the folders where not symlinked correclty</li>
</ul>
<p><b>Known Issues:</b></p>
<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><b>IMPORTANT NOTE:</b>
<p>
<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>
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>
<p>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>
</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>

View file

@ -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.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: main
- name: xmlstarlet
config-opts:
@ -417,7 +417,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
@ -628,6 +628,8 @@ modules:
- sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
sources:
- type: 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
@ -1091,4 +1093,4 @@ modules:
sources:
- type: git
url: https://github.com/XargonWan/RetroDECK.git
branch: cooker-0.6.2b
branch: cooker-0.6.3b

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