Merge remote-tracking branch 'upstream/1.20.1' into 1.20.1

Author: kdcjxbsdnbgfdg

.gitattributes

@@ -1,9 +1,10 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
-* text=autolf
+* text=auto
 
 # Explicitly declare text files you want to always be normalized and converted
 # to native line endings on checkout.
 *.json text eol=lf
+src/generated/resources/.cache/** text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
-*.png binary
+*.png binary

.github/ISSUE_TEMPLATE/001-feature-request.yml

@@ -8,6 +8,15 @@ body:
       label: Cross-mod Integration
       description: "Does this feature involve integration with another mod? If so specify the mod(s). Otherwise, leave this blank."
       placeholder: "Example: Create Mod"
+  - type: dropdown
+    id: mc-version
+    attributes:
+      label: Minecraft Version
+      description: The version of Minecraft you wish this feature was added for.
+      options:
+        - "Both"
+        - "1.20.1 Forge"
+        - "1.21.1 NeoForge"
   - type: textarea
     id: description
     attributes:

.github/actions/build_setup/action.yml

@@ -24,20 +24,9 @@ runs:
         distribution: temurin
         java-version: ${{ contains(env.REF, '1.20.1') && '17' || '21' }}
 
-    - name: Validate Gradle wrapper
-      uses: gradle/actions/wrapper-validation@v3
-
-    - name: Grant execute permission for gradlew
-      shell: bash
-      run: chmod +x gradlew
-
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@v4
       with:
         cache-write-only: ${{ inputs.update-cache }}
-        generate-job-summary: false
-        gradle-home-cache-includes: |
-          caches
-          notifications
-          jdks
-          wrapper
+        cache-read-only: ${{ github.ref != 'refs/heads/1.20.1' && github.ref != 'refs/heads/1.21' }}
+        add-job-summary: 'on-failure'

.github/json/config-1.21.json

@@ -40,6 +40,6 @@
     }
   },
   "max_pull_requests": 1000,
-  "max_back_track_time_days": 90,
+  "max_back_track_time_days": 365,
   "base_branches": ["1.21"]
 }

.github/json/config-latest-1.21.json

@@ -30,5 +30,6 @@
     }
   },
   "max_pull_requests": 1000,
-  "max_back_track_time_days": 60
+  "max_back_track_time_days": 365,
+  "base_branches": ["1.21"]
 }

.github/json/config-latest.json

@@ -30,5 +30,6 @@
     }
   },
   "max_pull_requests": 1000,
-  "max_back_track_time_days": 60
+  "max_back_track_time_days": 365,
+  "base_branches": ["1.20.1"]
 }

.github/json/config.json

@@ -40,6 +40,6 @@
     }
   },
   "max_pull_requests": 1000,
-  "max_back_track_time_days": 90,
+  "max_back_track_time_days": 365,
   "base_branches": ["1.20.1"]
 }

.github/labeler.yml

@@ -0,0 +1,5 @@
+# https://github.com/github/issue-labeler#usage
+1.20.1:
+  - '/^1\.20\.1 Forge$/m'
+1.21:
+  - '/^1\.21\.1 NeoForge$/m'

.github/workflows/auto-build.yml

@@ -23,6 +23,8 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # do a full checkout instead of a shallow clone of HEAD so spotless's ratchetFrom works
       - name: Setup Build
         uses: ./.github/actions/build_setup
       - name: Get Mod Version
@@ -31,15 +33,14 @@ jobs:
       - name: Version Suffix
         id: suffix
         run: echo "VERSION_SUFFIX=$(echo "${{ github.sha }}" | cut -c 1-7)" >> $GITHUB_ENV
-      - run: git fetch origin 1.20.1
       - name: Build
-        run: ./gradlew build --build-cache
+        run: ./gradlew build
       - name: Publish to Maven
         if: ${{ github.repository_owner == 'GregTechCEu' && env.PUBLISH == 'true' }}
-        run: ./gradlew publish --build-cache
+        run: ./gradlew publish
       - name: Rename Jars
         if: ${{ env.PUBLISH == 'true' }}
-        run: for file in build/libs/*; do mv "$file" "${file/SHOT/SHOT-$(date --utc '+%Y%m%d-%H%M%S')-${{ env.VERSION_SUFFIX }}}"; done;
+        run: for file in build/libs/*; do mv "$file" "${file/SHOT/SHOT+$(date --utc '+%Y%m%d-%H%M%S')-${{ env.VERSION_SUFFIX }}}"; done;
       - name: Upload Artifacts
         if: ${{ env.PUBLISH == 'true' }}
         uses: actions/upload-artifact@v4

.github/workflows/build-on-push.yml

@@ -32,7 +32,7 @@ jobs:
         uses: ./.github/actions/build_setup
       - name: Build
         if: steps.filter.outputs.code == 'true'
-        run: ./gradlew assemble --build-cache
+        run: ./gradlew assemble
       - name: Rename Jars
         if: steps.filter.outputs.code == 'true'
         run: for file in build/libs/*; do mv "$file" "${file/.jar/-${{ env.VERSION_SUFFIX }}.jar}"; done;