merge with main sorry for all the git stuff

Author: doyle31

.github/workflows/prettier.yml

@@ -3,6 +3,8 @@ name: Prettier Autofix
 on:
   push:
     branches: ["**"]
+  pull_request:
+    branches: ["main"]
 
 permissions:
   contents: write
@@ -24,8 +26,19 @@ jobs:
 
       - name: Run Prettier
         run: npx prettier --write "kubejs/**/*.{js,json}"
+        continue-on-error: false
 
       - name: Commit changes
+        if: github.event_name == 'push'
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: "chore: format with Prettier"
+          commit_message: "chore: prettier formatting"
+
+      - name: Check for formatting changes
+        if: github.event_name == 'pull_request'
+        run: |
+          if ! git diff --exit-code; then
+            echo "::notice::Some files are not properly formatted. You may want to run prettier locally. This will also get auto fixed on commit."
+          else
+            echo "::notice::All files are properly formatted."
+          fi

config/bcc-common.toml

@@ -1,6 +1,6 @@
 [general]
         modpackProjectID = 1298402
         modpackName = "ATM10 To the Sky"
-        modpackVersion = "1.2"
+        modpackVersion = "1.5"
         useMetadata = false