From 07f7d04eff8237ad0b2515ae88e2846a6d754588 Mon Sep 17 00:00:00 2001
From: PhlexPlexico <flexing@phlexplexi.co>
Date: Tue, 9 Jul 2024 16:17:27 -0600
Subject: [PATCH 01/11] Bump actions version to avoid deprecation.


From 02674522179180b26051a1275608890e911bc6f1 Mon Sep 17 00:00:00 2001
From: PhlexPlexico <flexing@phlexplexi.co>
Date: Tue, 9 Jul 2024 16:17:27 -0600
Subject: [PATCH 02/11] Bump actions version to avoid deprecation.

---
 Z3DR | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Z3DR b/Z3DR
index 0a68f83..4aecaa9 160000
--- a/Z3DR
+++ b/Z3DR
@@ -1 +1 @@
-Subproject commit 0a68f8318eb45ba7fa32706ff3988fd0f6851648
+Subproject commit 4aecaa9c2bb1e36e7fd09cc4b9087188bcdd203d

From 7c7080794a5306776b55eb5b3723e009e08e968c Mon Sep 17 00:00:00 2001
From: PhlexPlexico <flexing@phlexplexi.co>
Date: Wed, 10 Jul 2024 14:28:58 +0000
Subject: [PATCH 03/11] Update subrepo, update actions

---
 .github/workflows/build-check.yml  | 1 -
 .github/workflows/create-build.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index e19a511..bc026b9 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -24,7 +24,6 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/z3dr/randotools:next
-      options: --user 1001
 
     steps:      
     - name: Checkout Project
diff --git a/.github/workflows/create-build.yml b/.github/workflows/create-build.yml
index 80141a8..4c346bb 100644
--- a/.github/workflows/create-build.yml
+++ b/.github/workflows/create-build.yml
@@ -48,7 +48,6 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/z3dr/randotools:next
-      options: --user 1001
 
     steps:
       - name: Checkout Project

From 63dabea7322d52f918656d0aa7be537a0d3ca17a Mon Sep 17 00:00:00 2001
From: PhlexPlexico <flexing@phlexplexi.co>
Date: Wed, 10 Jul 2024 17:25:38 -0600
Subject: [PATCH 04/11] Attempt to fix broken build issue.

---
 .github/workflows/build-check.yml  | 1 +
 .github/workflows/create-build.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index bc026b9..e19a511 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -24,6 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/z3dr/randotools:next
+      options: --user 1001
 
     steps:      
     - name: Checkout Project
diff --git a/.github/workflows/create-build.yml b/.github/workflows/create-build.yml
index 4c346bb..80141a8 100644
--- a/.github/workflows/create-build.yml
+++ b/.github/workflows/create-build.yml
@@ -48,6 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/z3dr/randotools:next
+      options: --user 1001
 
     steps:
       - name: Checkout Project

From a4cebc8eab7a3fd604574e69e0516046815f64e0 Mon Sep 17 00:00:00 2001
From: Phlex <3514085+PhlexPlexico@users.noreply.github.com>
Date: Thu, 28 May 2026 11:19:40 -0600
Subject: [PATCH 05/11] Update actions and build process to match OoT3DR
 (thanks @HylianFreddy!)

---
 .github/workflows/build-check.yml  | 40 +++++++------
 .github/workflows/create-build.yml | 95 ++++++++++++++++--------------
 .gitignore                         |  1 +
 Makefile                           |  1 +
 linux_build_rando.sh               | 22 +------
 source/include/version.hpp         |  4 --
 source/menu.cpp                    |  2 +-
 source/settings.cpp                |  2 +-
 source/version.hpp                 |  1 +
 write_version.sh                   | 38 ++++++++++++
 10 files changed, 116 insertions(+), 90 deletions(-)
 delete mode 100644 source/include/version.hpp
 create mode 100644 source/version.hpp
 create mode 100755 write_version.sh

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index e19a511..0a326f0 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -1,24 +1,17 @@
 name: MM3DR Build Check
 
+env:
+  # These are used automatically by git
+  GIT_AUTHOR_NAME: ${{ github.actor }}
+  GIT_AUTHOR_EMAIL: ${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com
+  GIT_COMMITTER_NAME: GitHub Actions
+  GIT_COMMITTER_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
+
+
 on:
   pull_request:
 
 jobs:
-  # format:
-  #   name: Verify Formatting
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #   - name: Checkout Project
-  #     uses: actions/checkout@v4
-
-#    - name: Format Project
-#      uses: DoozyX/clang-format-lint-action@v0.15
-#      with:
-#        source: "./code ./source"
-#        extensions: 'c,h,cpp,hpp'
-#        clangFormatVersion: 14
-
   build:
     name: Confirm Compilable
     runs-on: ubuntu-latest
@@ -28,10 +21,21 @@ jobs:
 
     steps:      
     - name: Checkout Project
-      uses: actions/checkout@v4.1.7
+      uses: actions/checkout@v6.0.2
       with:
         submodules: true
-
+    
+    - name: Set Env Vars
+      shell: bash
+      run: |
+        pr_number=$(echo ${{ github.ref }} | cut -d / -f 3)
+        echo pr_number="$pr_number" | tee -a $GITHUB_ENV
+        short_sha=${GITHUB_SHA::6}
+        echo short_sha="$short_sha" | tee -a $GITHUB_ENV
+        echo artifact_name=MM3D_Randomizer_PR"$pr_number"_"$short_sha" | tee -a $GITHUB_ENV
+      
     - name: Compile Project
       run: |
-        make -j
\ No newline at end of file
+        chmod +x write_version.sh
+        make -j
+        mv -v MM3D_Randomizer.3dsx ${{ env.artifact_name }}.3dsx
\ No newline at end of file
diff --git a/.github/workflows/create-build.yml b/.github/workflows/create-build.yml
index 80141a8..14bab24 100644
--- a/.github/workflows/create-build.yml
+++ b/.github/workflows/create-build.yml
@@ -1,5 +1,12 @@
 name: MM3DR Build Script
 
+env:
+  # These are used automatically by git
+  GIT_AUTHOR_NAME: ${{ github.actor }}
+  GIT_AUTHOR_EMAIL: ${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com
+  GIT_COMMITTER_NAME: GitHub Actions
+  GIT_COMMITTER_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
+
 on:
   workflow_dispatch:
     inputs:
@@ -20,21 +27,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Project
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
       - name: Get Last Nightly Commit and Private Key
         id: nightly-version
         run: |
-          if [[ ${{ github.event.inputs.build_type == 'Nightly' }} == true ]]; then
-            echo "last_nightly=$(git describe --tags $(git rev-list --tags --max-count=1))" >> $GITHUB_ENV
-          else
-            echo "last_nightly=$(git describe --tags --match="v[0-9]*" HEAD --abbrev=0)" >> $GITHUB_ENV
-          fi
-          
+          echo "last_nightly=$(git describe --tags $(git rev-list --tags --max-count=1))" >> $GITHUB_ENV
       - name: Generate changelog
         id: changelog
-        uses: metcalfc/changelog-generator@v4.3.1
+        uses: metcalfc/changelog-generator@v4.7.0
         with:
           myToken: ${{ secrets.GITHUB_TOKEN }}
           base-ref: ${{ env.last_nightly }}
@@ -46,77 +48,73 @@ jobs:
     needs: get-changelog
     name: Build CIA and 3DSX Files
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     container:
-      image: ghcr.io/z3dr/randotools:next
-      options: --user 1001
+      image: ghcr.io/z3dr/randotools:latest
 
     steps:
       - name: Checkout Project
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v6.0.2
         with:
           submodules: true
-
-      - if: ${{ github.event.inputs.build_type == 'Nightly' }}
-        name: Run Build Script Nightly
-        run: |
-          chmod +x linux_build_rando.sh
-          ./linux_build_rando.sh
       
-      - if: ${{ github.event.inputs.build_type == 'Release' }}
-        name: Run Build Script Release
+      - name: Run Build Script
         env:
-          url_tag: v${{ github.event.inputs.version }}
+          GITHUB_BUILD_TYPE: ${{ github.event.inputs.build_type }}
+          GITHUB_INPUT_VERSION: ${{ github.event.inputs.version }}
         run: |
-          chmod +x linux_build_rando.sh
+          chmod +x linux_build_rando.sh write_version.sh
           ./linux_build_rando.sh
+      
+      - name: Create QR codes
+        run: |
+          qrencode -ocia.png https://github.com/$GITHUB_REPOSITORY/releases/download/${{ env.tag_name }}/MM3D_Randomizer.cia
+          qrencode -o3dsx.png https://github.com/$GITHUB_REPOSITORY/releases/download/${{ env.tag_name }}/MM3D_Randomizer.3dsx
 
-      - name: Get shorthand commit.
-        id: vars
-        run: echo "sha_short=$(echo ${{ github.sha }} | cut -c1-6)" >> $GITHUB_ENV
 
       - if: ${{ github.event.inputs.build_type == 'Nightly' }}
         name: Create Pre-release
-        uses: ncipollo/release-action@v1.14.0
+        uses: ncipollo/release-action@v1.21.0
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
           artifacts: "MM3D_Randomizer.cia,MM3D_Randomizer.3dsx,cia.png,3dsx.png"
           prerelease: true
           commit: "${{ github.sha }}"
-          tag: "Nightly-${{ env.sha_short }}"
-          name: "Nightly-${{ env.sha_short }}"
+          tag: "${{ env.tag_name }}"
+          name: "${{ env.tag_name }}"
           body: |
             Please note that these are DEVELOPMENT builds and may not be entirely stable.
             When reporting issues, please mention the six character commit listed in the randomizer menu.
             You can use the FBI homebrew application to install the randomizer using either of these QR codes.
             CIA QR Code:
-            ![CIA Download](https://github.com/${{ github.repository }}/releases/download/Nightly-${{ env.sha_short }}/cia.png)
+            ![CIA Download](https://github.com/${{ github.repository }}/releases/download/${{ env.tag_name }}/cia.png)
             3DSX QR Code:
-            ![CIA Download](https://github.com/${{ github.repository }}/releases/download/Nightly-${{ env.sha_short }}/3dsx.png)
+            ![3DSX Download](https://github.com/${{ github.repository }}/releases/download/${{ env.tag_name }}/3dsx.png)
 
-            Changes Since [${{ needs.get-changelog.outputs.last-nightly }}](https://github.com/${{ github.repository }}/releases/tag/${{ needs.get-changelog.outputs.last-nightly }}) 🛠:  
+            Changes Since [${{ needs.get-changelog.outputs.last-nightly }}](https://github.com/${{ github.repository }}/releases/tag/${{ needs.get-changelog.outputs.last-nightly }}) 🛠:
             ${{ needs.get-changelog.outputs.changelog }}
 
-
       - if: ${{ github.event.inputs.build_type == 'Release' }}
         name: Create Release
-        uses: ncipollo/release-action@v1.14.0
+        uses: ncipollo/release-action@v1.21.0
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
           artifacts: "MM3D_Randomizer.cia,MM3D_Randomizer.3dsx,cia.png,3dsx.png"
           prerelease: false
           commit: "${{ github.sha }}"
-          tag: "v${{ github.event.inputs.version }}"
-          name: "v${{ github.event.inputs.version }}"
+          tag: "${{ env.tag_name }}"
+          name: "${{ env.tag_name }}"
           body: |
-            ${{ github.event.inputs.version }} Changes 🛠:  
-            ${{ needs.get-changelog.outputs.changelog }}
-            
+            ${{ github.event.inputs.version }} Changes:
+            - Please check back later for a full list of changes.
+
             When reporting issues, please mention the six character commit listed in the randomizer menu.
             You can use the FBI homebrew application to install the randomizer using either of these QR codes.
             CIA QR Code:
-            ![CIA Download](https://github.com/${{ github.repository }}/releases/download/v${{ github.event.inputs.version }}/cia.png)
+            ![CIA Download](https://github.com/${{ github.repository }}/releases/download/${{ env.tag_name }}/cia.png)
             3DSX QR Code:
-            ![CIA Download](https://github.com/${{ github.repository }}/releases/download/v${{ github.event.inputs.version }}/3dsx.png)
+            ![3DSX Download](https://github.com/${{ github.repository }}/releases/download/${{ env.tag_name }}/3dsx.png)
 
   deploy-gist:
     needs: build-cia-3dsx
@@ -449,9 +447,16 @@ jobs:
           done
 
       - name: Deploy to Gist
-        uses: exuanbo/actions-deploy-gist@v1.1.4
-        with:
-          token: ${{ secrets.TOKEN }}
-          gist_id: a0bb911772800a7071eddf6298ff6e9f
-          gist_file_name: MM3DR.unistore
-          file_path: ./MM3DR.unistore
+        env:
+          GIST_ID: a0bb911772800a7071eddf6298ff6e9f
+          GIST_FILE_NAME: MM3DR.unistore
+          GIST_ACCESS_TOKEN: ${{ secrets.TOKEN }}
+        run: |
+          git clone https://$GIST_ACCESS_TOKEN@gist.github.com/$GIST_ID.git gist
+          cp ./$GIST_FILE_NAME ./gist/
+          cd gist
+          git add --all
+          if ! git diff --cached --quiet; then
+            git commit -m "Update UniStore"
+            git push
+          fi
diff --git a/.gitignore b/.gitignore
index e4509b4..11bdb2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,5 +23,6 @@ oldcode/loader/build
 *.pyc
 *.ips
 *.zar
+source/include/version.hpp
 source/include/patch_symbols.hpp
 .DS_Store
\ No newline at end of file
diff --git a/Makefile b/Makefile
index d54d025..844525c 100644
--- a/Makefile
+++ b/Makefile
@@ -176,6 +176,7 @@ all: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES)
 $(BUILD):
 	@git submodule update --init
 	$(MAKE) -C Z3DR/code/
+	@$(TOPDIR)/write_version.sh
 	@mv Z3DR/code/basecode.ips $(ROMFS)/basecode.ips
 	@mv Z3DR/code/basecode1.1.ips $(ROMFS)/basecode1.1.ips
 	@mv Z3DR/source/patch_symbols.hpp $(CURDIR)/source/include/
diff --git a/linux_build_rando.sh b/linux_build_rando.sh
index 7a3e3fc..9f3c834 100755
--- a/linux_build_rando.sh
+++ b/linux_build_rando.sh
@@ -1,17 +1,9 @@
 #!/bin/bash
-
+set -e
 compile() {
   # If building manually just replace SHA with your own text.
   APP_NAME=$(basename "$PWD")
   BANNERTOOLAPP=bannertool
-  IS_GH_ACTIONS=true
-  if [ -n "$GITHUB_SHA" ]; then
-    echo "Building on Github Actions..."
-  else
-    echo "GITHUB_SHA is empty, building locally."
-    IS_GH_ACTIONS=false
-    GITHUB_SHA=$(echo $(git rev-parse --short HEAD))
-  fi
   if ! command -v bannertoolexec &> /dev/null; then
       if ! command -v bannertool &> /dev/null; then
         echo "Bannertool not found in PATH. Please ensure it is in your path before continuing."
@@ -34,23 +26,11 @@ compile() {
     exit 1
   fi
 
-  export commitHashShort=$(echo ${GITHUB_SHA::6})
-  sed -i "s/develop/${commitHashShort:-develop}/" ./source/include/version.hpp
   make -j
-  sed -i "s/${commitHashShort}/develop/" ./source/include/version.hpp
   $BANNERTOOLAPP makebanner -i ./banner.png -a ./audio.wav -o ./banner.bnr
   $BANNERTOOLAPP makesmdh -s "Majora's Mask 3D Randomizer" -l "A Randomized Majoras Mask Experience" -p "Z3DR Team" -i icon.png -o ./icon.icn
   3dstool -cvtf romfs ./romfs.bin --romfs-dir ./romfs
   makerom -f cia -o ${APP_NAME}.cia -DAPP_ENCRYPTED=false -target t -exefslogo -elf ./${APP_NAME}.elf -icon ./icon.icn -banner ./banner.bnr -rsf ./mmrando.rsf -romfs ./romfs.bin -major 1 -minor 0 -micro 0
-  if $IS_GH_ACTIONS; then
-    if [[ ${url_tag+x} ]]; then
-      qrencode -ocia.png https://github.com/$GITHUB_REPOSITORY/releases/download/$url_tag/${APP_NAME}.cia
-      qrencode -o3dsx.png https://github.com/$GITHUB_REPOSITORY/releases/download/$url_tag/${APP_NAME}.3dsx
-    else
-      qrencode -ocia.png https://github.com/$GITHUB_REPOSITORY/releases/download/Nightly-$commitHashShort/${APP_NAME}.cia
-      qrencode -o3dsx.png https://github.com/$GITHUB_REPOSITORY/releases/download/Nightly-$commitHashShort/${APP_NAME}.3dsx
-    fi
-  fi
 }
 
 clean_up() {
diff --git a/source/include/version.hpp b/source/include/version.hpp
deleted file mode 100644
index fae44c5..0000000
--- a/source/include/version.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define RANDOMIZER_VERSION "v1.5.0"
-#define COMMIT_NUMBER "develop"
diff --git a/source/menu.cpp b/source/menu.cpp
index 21cc3e5..2a36e19 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -34,7 +34,7 @@ void PrintTopScreen()
 	consoleSelect(&topScreen);
 	consoleClear();
 	printf("\x1b[2;11H%sMajoras Mask 3D Randomizer%s", MEGANTA, RESET);
-	printf("\x1b[3;18H%s%s-%s%s",MEGANTA, RANDOMIZER_VERSION, COMMIT_NUMBER, RESET);
+	printf("\x1b[3;18H%s%s%s",MEGANTA, RANDOMIZER_VERSION, RESET);
 	printf("\x1b[4;10HA/B/D-pad: Navigate Menu\n");
 	printf("			Select: Exit to Homebrew Menu\n");
 	printf("				 Y: New Random Seed\n");
diff --git a/source/settings.cpp b/source/settings.cpp
index 204036c..4cf5ad9 100644
--- a/source/settings.cpp
+++ b/source/settings.cpp
@@ -22,7 +22,7 @@ using namespace game::pad;
 
 namespace Settings {
   std::string seed;
-  std::string version = RANDOMIZER_VERSION "-" COMMIT_NUMBER;
+  std::string version = RANDOMIZER_VERSION;
   std::array<u8, 5> hashIconIndexes;
 
 
diff --git a/source/version.hpp b/source/version.hpp
new file mode 100644
index 0000000..bd6e50f
--- /dev/null
+++ b/source/version.hpp
@@ -0,0 +1 @@
+#define RANDOMIZER_VERSION "dev-24dc60*"
diff --git a/write_version.sh b/write_version.sh
new file mode 100755
index 0000000..b6db9e0
--- /dev/null
+++ b/write_version.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# This script creates the name for the release git tag and the version string to show in the randomizer menu.
+# It generates a header file with a macro for the version string.
+
+VERSION_FILE="source/version.hpp"
+
+if [[ -n $GITHUB_ENV ]]
+then
+    # Building from GitHub Actions
+    # GITHUB_BUILD_TYPE and GITHUB_INPUT_VERSION are defined in `create_build.yml`
+
+    if [[ "$GITHUB_BUILD_TYPE" = "Release" ]]
+    then
+        VERSION="v$GITHUB_INPUT_VERSION"
+    else
+        VERSION="$GITHUB_BUILD_TYPE-${GITHUB_SHA::6}"
+    fi
+    echo "tag_name=$VERSION" >> $GITHUB_ENV
+else
+    # Building locally
+    VERSION=dev-$(git show --no-patch --format=format:"%h" --abbrev=6)
+
+    # If there are uncommitted changes, add a `*` to the version.
+    if [[ -n $(git status --porcelain) ]]
+    then
+        VERSION="${VERSION}*"
+    fi
+fi
+
+# If the version string doesn't change, don't rewrite the file to avoid useless rebuilds.
+NEW_CONTENT="#define RANDOMIZER_VERSION \"$VERSION\""
+OLD_CONTENT="$(cat "$VERSION_FILE" 2> /dev/null || true)"
+if [[ "$NEW_CONTENT" != "$OLD_CONTENT" ]]
+then
+    echo "$NEW_CONTENT" > "$VERSION_FILE"
+    echo "Wrote version string: $VERSION"
+fi
\ No newline at end of file

From aaf4bd8d85753327175cbecacfe0219b706e39e4 Mon Sep 17 00:00:00 2001
From: Phlex <3514085+PhlexPlexico@users.noreply.github.com>
Date: Thu, 28 May 2026 11:26:40 -0600
Subject: [PATCH 06/11] Update Z3DR to latest commit.

---
 Z3DR | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Z3DR b/Z3DR
index 4aecaa9..0b48cc1 160000
--- a/Z3DR
+++ b/Z3DR
@@ -1 +1 @@
-Subproject commit 4aecaa9c2bb1e36e7fd09cc4b9087188bcdd203d
+Subproject commit 0b48cc12c90575ca4d40ee849af12f88ac56eb0e

From ec7bed7bd32c552c6604f10946beabfe965b9737 Mon Sep 17 00:00:00 2001
From: Phlex <3514085+PhlexPlexico@users.noreply.github.com>
Date: Thu, 28 May 2026 11:31:19 -0600
Subject: [PATCH 07/11] Remove version and mark as ignored since
 programmatically generated.

---
 .gitignore         | 2 +-
 source/version.hpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 source/version.hpp

diff --git a/.gitignore b/.gitignore
index 11bdb2b..8fbe54e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,6 @@ oldcode/loader/build
 *.pyc
 *.ips
 *.zar
-source/include/version.hpp
+source/version.hpp
 source/include/patch_symbols.hpp
 .DS_Store
\ No newline at end of file
diff --git a/source/version.hpp b/source/version.hpp
deleted file mode 100644
index bd6e50f..0000000
--- a/source/version.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#define RANDOMIZER_VERSION "dev-24dc60*"

From 2ff811f6277fb6776792210503f5ebca9528c6c6 Mon Sep 17 00:00:00 2001
From: Phlex <3514085+PhlexPlexico@users.noreply.github.com>
Date: Fri, 29 May 2026 14:43:23 -0600
Subject: [PATCH 08/11] Include compilable 3dsx in build check.

This ensures that people can download the latest commit in the action when it's confirmed compilable.
---
 .github/workflows/build-check.yml | 20 ++++++++++----------
 Z3DR                              |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index 0a326f0..a2f1a48 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -1,13 +1,5 @@
 name: MM3DR Build Check
 
-env:
-  # These are used automatically by git
-  GIT_AUTHOR_NAME: ${{ github.actor }}
-  GIT_AUTHOR_EMAIL: ${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com
-  GIT_COMMITTER_NAME: GitHub Actions
-  GIT_COMMITTER_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
-
-
 on:
   pull_request:
 
@@ -15,9 +7,11 @@ jobs:
   build:
     name: Confirm Compilable
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     container:
       image: ghcr.io/z3dr/randotools:next
-      options: --user 1001
+    
 
     steps:      
     - name: Checkout Project
@@ -38,4 +32,10 @@ jobs:
       run: |
         chmod +x write_version.sh
         make -j
-        mv -v MM3D_Randomizer.3dsx ${{ env.artifact_name }}.3dsx
\ No newline at end of file
+        mv -v MM3D_Randomizer.3dsx ${{ env.artifact_name }}.3dsx
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v6
+      with:
+        name: ${{ env.artifact_name }}
+        path: ${{ env.artifact_name }}.3dsx
\ No newline at end of file
diff --git a/Z3DR b/Z3DR
index 0b48cc1..6d3ed5e 160000
--- a/Z3DR
+++ b/Z3DR
@@ -1 +1 @@
-Subproject commit 0b48cc12c90575ca4d40ee849af12f88ac56eb0e
+Subproject commit 6d3ed5ef7fa3bf4aeba5186f6ce8536335693ee5

From cde26c9cb28e38149c451dd317d8a4c9e38cd842 Mon Sep 17 00:00:00 2001
From: Phlex <3514085+PhlexPlexico@users.noreply.github.com>
Date: Sun, 31 May 2026 14:00:04 -0600
Subject: [PATCH 09/11] Remove chmod as they are not needed.

---
 .github/workflows/build-check.yml  | 1 -
 .github/workflows/create-build.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index a2f1a48..dce2f96 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -30,7 +30,6 @@ jobs:
       
     - name: Compile Project
       run: |
-        chmod +x write_version.sh
         make -j
         mv -v MM3D_Randomizer.3dsx ${{ env.artifact_name }}.3dsx
 
diff --git a/.github/workflows/create-build.yml b/.github/workflows/create-build.yml
index 14bab24..d1cd30b 100644
--- a/.github/workflows/create-build.yml
+++ b/.github/workflows/create-build.yml
@@ -64,7 +64,6 @@ jobs:
           GITHUB_BUILD_TYPE: ${{ github.event.inputs.build_type }}
           GITHUB_INPUT_VERSION: ${{ github.event.inputs.version }}
         run: |
-          chmod +x linux_build_rando.sh write_version.sh
           ./linux_build_rando.sh
       
       - name: Create QR codes

From bec1696a8eff6e5e66883253ff5e2ff5dc91176b Mon Sep 17 00:00:00 2001
From: Phlex <3514085+PhlexPlexico@users.noreply.github.com>
Date: Sun, 31 May 2026 14:04:44 -0600
Subject: [PATCH 10/11] Update Z3DR for latest moon changes.

---
 Z3DR | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Z3DR b/Z3DR
index 6d3ed5e..6287dca 160000
--- a/Z3DR
+++ b/Z3DR
@@ -1 +1 @@
-Subproject commit 6d3ed5ef7fa3bf4aeba5186f6ce8536335693ee5
+Subproject commit 6287dcafb4b8331a3f4ae3278a5df56672c77964

From ae058528a92996455dfa18d5c7e5507e3f586046 Mon Sep 17 00:00:00 2001
From: Phlex <3514085+PhlexPlexico@users.noreply.github.com>
Date: Sun, 31 May 2026 15:59:36 -0600
Subject: [PATCH 11/11] Add user to avoid potential crash from ownership

---
 .github/workflows/build-check.yml  | 1 +
 .github/workflows/create-build.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index dce2f96..c40ca1a 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -11,6 +11,7 @@ jobs:
       contents: write
     container:
       image: ghcr.io/z3dr/randotools:next
+      options: --user 1001
     
 
     steps:      
diff --git a/.github/workflows/create-build.yml b/.github/workflows/create-build.yml
index d1cd30b..1641d7a 100644
--- a/.github/workflows/create-build.yml
+++ b/.github/workflows/create-build.yml
@@ -52,6 +52,7 @@ jobs:
       contents: write
     container:
       image: ghcr.io/z3dr/randotools:latest
+      options: --user 1001
 
     steps:
       - name: Checkout Project