.gitignore

@@ -1,4 +1,3 @@
 /.flatpak-builder/
 /.build/
 /repo/
-./.vscode

net.rpcs3.RPCS3.yaml

@@ -97,4 +97,5 @@ modules:
     sources:
       - type: git
         url: https://github.com/RPCS3/rpcs3.git
-        commit: 665bb8329786e39aca0fd082870ae83996c06c56
+        branch: master
+        commit: 1b87e186c45a21de83e9fdc859af3e0c92ae8509

shared-modules

@@ -1 +1 @@
-Subproject commit 627dcefe587e693ff99269361f1d0cdf10aac340
+Subproject commit d47140b52c6ef4a9ae61fe0fda3b31c3e36f2291

update_from_upstream.sh

@@ -1,32 +1,4 @@
 #!/bin/bash
 
-target_branch="master"
-update_submodules="true"
-
-# Get the repository name
-repo_url=$(git remote get-url origin)
-repo_name=$(basename -s .git "$repo_url")
-
-echo "Fetching https://github.com/flathub/$repo_name $target_branch"
-if [ "$update_submodules" = "true" ]; then
-    echo "And updating submodules also"
-fi
-echo ""
-
-# Fetch the latest changes from the remote master branch
-git fetch https://github.com/flathub/"$repo_name" "$target_branch"
-
-# Merge the fetched changes into your current branch
-git merge FETCH_HEAD
-
-if [ "$update_submodules" = "true" ]; then
-    # Update submodules to the versions specified in the repo
-    git submodule update --init --recursive
-
-    # Update submodules to the versions specified in the fetched repo
-    git submodule update --remote
-    git add shared-modules
-    git commit -m "Update shared modules"
-fi
-
-
+git fetch https://github.com/flathub/net.rpcs3.RPCS3 master  # Fetch the latest changes from the remote master branch
+git merge FETCH_HEAD  # Merge the fetched changes into your current branch