From 48924e3364a77de5fb9a9826ea21089735dfb63c Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Fri, 9 Jun 2023 12:46:08 -0400
Subject: [PATCH 1/4] Allow DashLoader 5 on 1.19.4+

---
 fabric/src/main/resources/fabric.mod.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index f1518b24..1605d251 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -37,6 +37,6 @@
     "minecraft": ">=1.16.2"
   },
   "breaks": {
-    "dashloader": "*"
+    "dashloader": "<5.0.0-beta.1"
   }
 }

From a2d82472a47ae0d7f826efed5d4c83a8222ab70b Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Fri, 9 Jun 2023 13:05:40 -0400
Subject: [PATCH 2/4] Add automated, ephemeral release workflow [skip ci]

---
 .github/workflows/release.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..5e145a52
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,30 @@
+name: release-artifacts
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build and publish mod to CurseForge & Modrinth
+        run: ./gradlew forge:publishToModSites fabric:publishToModSites
+        env:
+          CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+      - name: Upload assets to GitHub
+        uses: AButler/upload-release-assets@v2.0
+        with:
+          files: 'bin/*'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From 02a68f7689f40a35609a678311a504bdcac0b849 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sun, 11 Jun 2023 20:06:42 -0400
Subject: [PATCH 3/4] Fix Wizards spell textures being missing

---
 .../fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
index 85869537..3e7df351 100644
--- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
+++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
@@ -248,7 +248,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
                 "part",
                 "pipe",
                 "ropebridge",
-                "solid_block"
+                "solid_block",
+                "spell_projectile"
         };
         for(String folder : extraFolders) {
             Collection<ResourceLocation> textureLocations = this.resourceManager.listResources("textures/" + folder, p -> p.endsWith(".png"));

From 99e030ce27173be4090c4febdcb2ebf4dd0ae438 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sun, 11 Jun 2023 20:44:39 -0400
Subject: [PATCH 4/4] Add script for auto-propagating changes to modern
 branches where possible [skip ci]

---
 scripts/propagate.sh             | 44 ++++++++++++++++++++++++++++++++
 release.sh => scripts/release.sh |  0
 2 files changed, 44 insertions(+)
 create mode 100755 scripts/propagate.sh
 rename release.sh => scripts/release.sh (100%)

diff --git a/scripts/propagate.sh b/scripts/propagate.sh
new file mode 100755
index 00000000..f0fce218
--- /dev/null
+++ b/scripts/propagate.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+set -e
+
+WORK_DIR=`mktemp -d`
+
+# deletes the temp directory
+function cleanup {
+  cd $HOME
+  rm -rf "$WORK_DIR"
+}
+
+trap cleanup EXIT
+
+# clone ModernFix repo
+
+echo "downloading temporary modernfix..."
+cd $WORK_DIR
+git clone https://github.com/embeddedt/ModernFix mfix &>/dev/null
+cd mfix
+
+# gather version list
+readarray -t all_versions < <(git ls-remote --heads origin | awk '{print $2}' | sed 's:.*/::' | sort -V)
+echo "found versions: ${all_versions[@]}"
+
+# checkout base version
+git checkout -b propagations/${all_versions[0]} origin/${all_versions[0]} &>/dev/null
+
+our_version=${all_versions[0]}
+restore_version=$our_version
+
+for version in "${all_versions[@]}"; do
+    if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then
+        echo -n "merging $our_version into ${version}... "
+        git checkout -b propagations/$version origin/$version &>/dev/null
+        if git merge -m "Merge $our_version into $version" propagations/$our_version >/dev/null; then
+            echo "done"
+            git push -u origin propagations/$version:$version &>/dev/null
+        else
+            echo "failed, this merge must be done manually"
+            exit 1
+        fi
+        our_version=$version
+    fi
+done
diff --git a/release.sh b/scripts/release.sh
similarity index 100%
rename from release.sh
rename to scripts/release.sh