From 9d77af6f20f6e1537befa8781069f149aadd4304 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Tue, 1 Apr 2025 21:50:33 -0400
Subject: [PATCH 1/2] Sync GitHub Actions workflow with dev branch

---
 .github/workflows/main.yml | 63 +++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 55edb7b6..ea31470d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,32 +9,26 @@ on:
     tags:
     - '*'
   pull_request:
-    branches:
-    - master
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
-  build-qt5-linux:
+  build-linux:
+    strategy:
+     matrix:
+       qtversion: [5.14.2, 6.8.2]
     runs-on: ubuntu-latest
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - name: Cache Qt
-        id: cache-qt
-        uses: actions/cache@v1
-        with:
-          path: ../Qt
-          key: ${{ runner.os }}-QtCache
+      - uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '5.14.2'
-          modules: 'qtwidgets qtqml'
-          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+          version: ${{ matrix.qtversion }}
+          modules: 'qtcharts'
+          cache: 'true'
 
       - name: Configure
         run: qmake porymap.pro
@@ -43,23 +37,22 @@ jobs:
         run: make
 
   build-macos:
-    runs-on: macos-latest
+    strategy:
+     matrix:
+       os: [macos-latest, macos-13]
+    runs-on: ${{ matrix.os }}
+    env:
+      BUILD_NAME: porymap-${{ matrix.os }}-${{ github.ref_name }}
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - name: Cache Qt
-        id: cache-qt
-        uses: actions/cache@v1
-        with:
-          path: ../Qt
-          key: ${{ runner.os }}-QtCache
+      - uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '6.2.*'
-          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+          version: '6.8.2'
+          modules: 'qtcharts'
+          cache: 'true'
 
       - name: Configure
         run: qmake -config release porymap.pro
@@ -74,19 +67,19 @@ jobs:
       - name: Prep Release Directory
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          mkdir porymap-macOS-${{ github.ref_name }}
-          cp porymap.dmg porymap-macOS-${{ github.ref_name }}/porymap.dmg
-          cp RELEASE-README.txt porymap-macOS-${{ github.ref_name }}/README.txt
+          mkdir $BUILD_NAME
+          cp porymap.dmg $BUILD_NAME/porymap.dmg
+          cp RELEASE-README.txt $BUILD_NAME/README.txt
 
       - name: Bundle Release Directory
         if: startsWith(github.ref, 'refs/tags/')
-        run: zip -r porymap-macOS-${{ github.ref_name }}.zip porymap-macOS-${{ github.ref_name }}
+        run: zip -r $BUILD_NAME.zip $BUILD_NAME
 
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: porymap-macOS-${{ github.ref_name }}.zip
+          files: $BUILD_NAME.zip
         env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -94,7 +87,7 @@ jobs:
     runs-on: windows-latest
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       
       - uses: dsaltares/fetch-gh-release-asset@master
         if: steps.cache-static-qt.outputs.cache-hit != 'true'
@@ -152,7 +145,7 @@ jobs:
         run: powershell.exe -Command "Compress-Archive -Path porymap-windows-${{ github.ref_name }} -DestinationPath porymap-windows-${{ github.ref_name }}.zip"
       
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: porymap-windows-${{ github.ref_name }}.zip

From 825cd5107374b5c6f85c13cd23c47bc784763bc1 Mon Sep 17 00:00:00 2001
From: "Danny Wang (ThePeeps191)"
 <74725787+ThePeeps191@users.noreply.github.com>
Date: Tue, 1 Apr 2025 20:35:09 -0600
Subject: [PATCH 2/2] fix small typo in creating-new-maps.html (#712)

---
 docs/manual/creating-new-maps.html  | 4 ++--
 docsrc/manual/creating-new-maps.rst | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/manual/creating-new-maps.html b/docs/manual/creating-new-maps.html
index 516cdc8c..180b57e5 100644
--- a/docs/manual/creating-new-maps.html
+++ b/docs/manual/creating-new-maps.html
@@ -456,7 +456,7 @@ in order to add a new map to the folder.</p>
 <dt>Name</dt>
 <dd>The name of the new map. This cannot be changed in porymap.</dd>
 <dt>Group</dt>
-<dd>Which map group the new map will beling to. This cannot be changed in porymap.</dd>
+<dd>Which map group the new map will belong to. This cannot be changed in porymap.</dd>
 <dt>Map Width</dt>
 <dd>The width (in metatiles) of the map. This can be changed in porymap.</dd>
 <dt>Map Height</dt>
@@ -538,4 +538,4 @@ in order to add a new map to the folder.</p>
    
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docsrc/manual/creating-new-maps.rst b/docsrc/manual/creating-new-maps.rst
index be660e37..4da20776 100644
--- a/docsrc/manual/creating-new-maps.rst
+++ b/docsrc/manual/creating-new-maps.rst
@@ -31,7 +31,7 @@ Name
 	The name of the new map. This cannot be changed in porymap.
 
 Group
-	Which map group the new map will beling to. This cannot be changed in porymap.
+	Which map group the new map will belong to. This cannot be changed in porymap.
 
 Map Width
 	The width (in metatiles) of the map. This can be changed in porymap.