Merge branch 'main' into compatibility-rework-2

This is needed for git to automerge

.github/workflows/generate_flatpak_nuget_deps.yml

@@ -0,0 +1,40 @@
+name: "Nuget Dependencies"
+
+on:
+  workflow_dispatch:
+
+jobs:
+  Generate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+
+      - name: Setup Python3
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+
+      - name: Setup Flatpak
+        run: |
+          sudo apt update -y
+          sudo apt install flatpak -y
+          flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo 
+          flatpak install --user org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y # Update this when needed.
+          flatpak install --user org.freedesktop.Sdk/x86_64/22.08 -y # As well as this, if dependency generation is failing.
+
+      - name: Generate nuget-dependencies.json
+        working-directory: ./src/XIVLauncher.Core/
+        run: |
+          curl -LO https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/dotnet/flatpak-dotnet-generator.py
+          python3 flatpak-dotnet-generator.py nuget-dependencies.json XIVLauncher.Core.csproj
+
+      - name: Upload nuget-dependencies.json
+        uses: actions/upload-artifact@v3
+        with:
+          name: nuget-dependencies
+          path: |
+            ./src/XIVLauncher.Core/nuget-dependencies.json

.github/workflows/make-release.yml

@@ -89,7 +89,13 @@ jobs:
           # Clone the repository we want to make the PR to.
           gh repo fork ${{ env.BASE_REPO }} --clone=true --remote=true /tmp/xlcore-flatpak
 
-          # Create a new branch for the PR.
+          # Sync the main branch & create a new branch for the PR 
+          git -C /tmp/xlcore-flatpak fetch upstream
+          git -C /tmp/xlcore-flatpak reset --hard && git -C /tmp/xlcore-flatpak clean -fdx
+          git -C /tmp/xlcore-flatpak pull upstream master
+
+          # Delete (if exists) and create the branch we want to make the PR from.
+          git -C /tmp/xlcore-flatpak branch -D ${{ env.HEAD_BRANCH }} || true
           git -C /tmp/xlcore-flatpak checkout -b ${{ env.HEAD_BRANCH }}
 
           # Copy the files we need to the forked repository.
@@ -113,7 +119,7 @@ jobs:
 
           # Push the changes to the fork.
           git remote -v 
-          git push --set-upstream origin ${{ env.HEAD_BRANCH }}
+          git push --set-upstream origin ${{ env.HEAD_BRANCH }} --force
 
           # Make a PR from the fork to the upstream repository.
           gh pr create --repo ${{ env.BASE_REPO }} --title "Update to ${{ github.ref_name }}" --body "This PR was automatically generated by GitHub Actions."

README.md

@@ -24,6 +24,7 @@ XIVLauncher Core has community packages for various Linux distributions. Please
 | [Copr (Fedora+openSuse+EL9)](https://copr.fedorainfracloud.org/coprs/rankyn/xivlauncher/) | ![COPR version](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Frankynbass%2FXIVLauncher4rpm%2Fmain%2Fbadge.json)|
 | [GURU (Gentoo)](https://gitweb.gentoo.org/repo/proj/guru.git/tree/games-util/xivlauncher) | ![GURU version](https://repology.org/badge/version-for-repo/gentoo_ovl_guru/xivlauncher.svg?header=guru) |
 | [MPR (Debian+Ubuntu)](https://mpr.makedeb.org/packages/xivlauncher)  | ![MPR package](https://repology.org/badge/version-for-repo/mpr/xivlauncher.svg?header=MPR) |
-| [nixpkgs stable](https://search.nixos.org/packages?channel=22.11&from=0&size=50&sort=relevance&type=packages&query=xivlauncher) | ![nixpkgs stable version](https://repology.org/badge/version-for-repo/nix_stable_22_11/xivlauncher.svg?header=nixpkgs%2022.11) |
+| [MPR (git) (Debian+Ubuntu)](https://mpr.makedeb.org/packages/xivlauncher-git)  | ![MPR package](https://repology.org/badge/version-for-repo/mpr/xivlauncher.svg?header=MPR) |
+| [nixpkgs stable](https://search.nixos.org/packages?channel=23.05&from=0&size=50&sort=relevance&type=packages&query=xivlauncher) | ![nixpkgs stable version](https://repology.org/badge/version-for-repo/nix_stable_23_05/xivlauncher.svg?header=nixpkgs%2023.05) |
 | [nixpkgs unstable](https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=xivlauncher) | ![nixpkgs unstable version](https://repology.org/badge/version-for-repo/nix_unstable/xivlauncher.svg?header=nixpkgs%20unstable) |
-| [PPA (Ubuntu)](https://launchpad.net/~linneris/+archive/ubuntu/xivlauncher-core-stable) | ![PPA version](https://img.shields.io/static/v1?label=PPA&message=1.0.3&color=brightgreen) |
+| [PPA (Ubuntu)](https://launchpad.net/~linneris/+archive/ubuntu/xivlauncher-core-stable) | ![PPA version](https://img.shields.io/static/v1?label=PPA&message=1.0.5&color=brightgreen) |

src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs

@@ -117,7 +117,7 @@ public override void Draw()
 
                 ImGui.Separator();
 
-                if (ImGui.MenuItem("Launch without 3rd-party plugins"))
+                if (ImGui.MenuItem("Launch without custom repo plugins"))
                 {
                     this.OnLogin?.Invoke(LoginAction.GameNoThirdparty);
                 }

src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabWine.cs

@@ -36,9 +36,10 @@ public SettingsTabWine()
                 CheckVisibility = () => RuntimeInformation.IsOSPlatform(OSPlatform.Linux),
                 CheckValidity = b =>
                 {
-                    if (b == true && (!File.Exists("/usr/lib/libgamemodeauto.so.0") && !File.Exists("/app/lib/libgamemodeauto.so.0")))
+                    var handle = IntPtr.Zero;
+                    if (b == true && !NativeLibrary.TryLoad("libgamemodeauto.so.0", out handle))
                         return "GameMode was not detected on your system.";
-
+                    NativeLibrary.Free(handle);
                     return null;
                 }
             },

src/XIVLauncher.Core/XIVLauncher.Core.csproj

@@ -9,7 +9,7 @@
     <LangVersion>latest</LangVersion>
     <ApplicationIcon>Resources\dalamud_icon.ico</ApplicationIcon>
 
-    <Version>1.0.4.0</Version>
+    <Version>1.0.6.0</Version>
     <FileVersion>$(Version)</FileVersion>
     <AssemblyVersion>$(Version)</AssemblyVersion>