Merge remote-tracking branch 'upstream/master' into develop

MuteTiefling · Feb 12, 2025 · 075ab13 · 075ab13
2 parents f543f6a + e7a7be5
commit 075ab13
Show file tree

Hide file tree

Showing 26 changed files with 663 additions and 423 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -101,4 +101,4 @@ Re-run the script `update-server` whenever you want to update to a new modpack v
 
 -   [CurseForge (expert)](https://www.curseforge.com/minecraft/modpacks/enigmatica6expert)
 
--   [Discord](https://discord.gg/HnWNd7X)
+-   [Discord](https://discord.gg/enigmatica)
diff --git a/.github/actions/ci/node/package-lock.json b/.github/actions/ci/node/package-lock.json
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   support-requests:
-    uses: NillerMedDild/.github/.github/workflows/support.yml@master
+    uses: EnigmaticaModpacks/.github/.github/workflows/support.yml@master
Original file line number	Diff line number	Diff line change
Expand Up		@@ -101,4 +101,4 @@ Re-run the script `update-server` whenever you want to update to a new modpack v

		- [CurseForge (expert)](https://www.curseforge.com/minecraft/modpacks/enigmatica6expert)

		- [Discord](https://discord.gg/HnWNd7X)
		- [Discord](https://discord.gg/enigmatica)