forked from Creators-of-Create/Create
-
Notifications
You must be signed in to change notification settings - Fork 203
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'concealed/mc1.20.1/fabric/feature-dev' …
…into mc1.20.1/fabric/dev # Conflicts: # .editorconfig # src/generated/resources/.cache/08785d2602593b8339c92b292c17771037bbb1c3 # src/generated/resources/.cache/3f8e2bfad643b52631e6eb80098aea304497f9a9 # src/generated/resources/.cache/528ac2e8644db78e56272a28e1f653f416709616 # src/generated/resources/.cache/899d321c4524b581eebda1c204a82d1a56a5eaa0 # src/generated/resources/.cache/8ede8fad2f9d17f80679e3b4a06e7ce5921f134f # src/generated/resources/.cache/a76509380f1db986fe6ec9b45cfec8ecffb3c2ef
- Loading branch information
Showing
4,224 changed files
with
104,240 additions
and
76,826 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| blank_issues_enabled: true | ||
| contact_links: | ||
| - name: I have a question! | ||
| url: https://discord.gg/hmaD7Se | ||
| about: Join us on Discord and ask the community. | ||
| - name: I have a suggestion or idea! | ||
| url: https://discord.gg/hmaD7Se | ||
| about: These are best discussed with the community and submitted on Discord. | ||
| - name: Talk to us on Discord. | ||
| url: https://discord.gg/hmaD7Se | ||
| about: Ask questions and get help from the community. | ||
| - name: I have a question! | ||
| url: https://discord.gg/hmaD7Se | ||
| about: Join us on Discord and ask the community. | ||
| - name: I have a suggestion or idea! | ||
| url: https://discord.gg/hmaD7Se | ||
| about: These are best discussed with the community and submitted on Discord. | ||
| - name: Talk to us on Discord. | ||
| url: https://discord.gg/hmaD7Se | ||
| about: Ask questions and get help from the community. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,53 @@ | ||
| name: Build | ||
| on: | ||
| push: | ||
| pull_request: | ||
| workflow_dispatch: | ||
| inputs: | ||
| publish: | ||
| description: Publish to Modrinth and CurseForge | ||
| required: true | ||
| default: "false" | ||
| patch: | ||
| description: Patch number, 0 for first (ex. Create 1.19.2 v0.5.0.g Patch N) | ||
| required: true | ||
| push: | ||
| pull_request: | ||
| workflow_dispatch: | ||
| inputs: | ||
| release: | ||
| description: Is this a release build? | ||
| type: boolean | ||
| required: true | ||
| default: false | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| PUBLISH_SUFFIX: snapshots | ||
| MAVEN_USER: ${{ secrets.MAVEN_USER }} | ||
| MAVEN_PASS: ${{ secrets.MAVEN_PASS }} | ||
| MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} | ||
| CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} | ||
| PATCH_NUMBER: ${{ github.event.inputs.patch }} | ||
| PUBLISHING: ${{ github.event.inputs.publish }} | ||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup Java | ||
| run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV" | ||
|
|
||
| - name: Loom Cache | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: "**/.gradle/loom-cache" | ||
| key: "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}" | ||
| restore-keys: "${{ runner.os }}-gradle-" | ||
|
|
||
| - name: Setup Gradle | ||
| uses: gradle/actions/setup-gradle@v4 | ||
| with: | ||
| gradle-home-cache-cleanup: true | ||
|
|
||
| - name: Validate Gradle Wrapper Integrity | ||
| uses: gradle/wrapper-validation-action@v2 | ||
|
|
||
| - name: Run Gametests | ||
| run: ./gradlew runGametestServer --no-daemon | ||
|
|
||
| - name: Build and/or Publish | ||
| run: ./gradlew buildOrPublish | ||
|
|
||
| - name: Capture build artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: Artifacts | ||
| path: build/libs/ | ||
|
|
||
| - name: Publish to Modrinth and CurseForge | ||
| if: ${{ github.event.inputs.publish }} | ||
| run: ./gradlew publishMod | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup Java | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: "temurin" | ||
| java-version: 17 | ||
|
|
||
| - name: Setup Gradle | ||
| uses: gradle/actions/setup-gradle@v4 | ||
| with: | ||
| cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} | ||
|
|
||
| - name: Validate Gradle Wrapper Integrity | ||
| uses: gradle/wrapper-validation-action@v2 | ||
|
|
||
| - name: Build | ||
| run: ./gradlew build | ||
|
|
||
| - name: Run Gametests | ||
| run: ./gradlew runGametestServer | ||
|
|
||
| - name: Publish to Maven | ||
| if: ${{ github.event.inputs.release }} | ||
| run: >- | ||
| ./gradlew publishAllPublicationsToDevOsReleasesRepository | ||
| -PdevOsReleasesUsername="${{ secrets.MAVEN_USER }}" | ||
| -PdevOsReleasesPassword="${{ secrets.MAVEN_PASS }}" | ||
| # TODO: add back CF and MR publishing at some point | ||
|
|
||
| - name: Capture Build Artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: Artifacts | ||
| path: build/libs/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| name: "Label Actions" | ||
| name: Label Actions | ||
| on: | ||
| issues: | ||
| types: [labeled, unlabeled] | ||
| pull_request_target: | ||
| types: [labeled, unlabeled] | ||
| issues: | ||
| types: [ labeled, unlabeled ] | ||
| pull_request_target: | ||
| types: [ labeled, unlabeled ] | ||
|
|
||
| permissions: | ||
| contents: read | ||
| issues: write | ||
| pull-requests: write | ||
| discussions: write | ||
| contents: read | ||
| issues: write | ||
| pull-requests: write | ||
| discussions: write | ||
|
|
||
| jobs: | ||
| action: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: dessant/label-actions@102faf474a544be75fbaf4df54e73d3c515a0e65 # Depend on an exact commit | ||
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| config-path: '.github/config/label-actions.yml' | ||
| action: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: dessant/label-actions@102faf474a544be75fbaf4df54e73d3c515a0e65 # Depend on an exact commit | ||
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| config-path: '.github/config/label-actions.yml' |
Oops, something went wrong.