Skip to content
This repository has been archived by the owner on Oct 20, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/1.20-fabric' into 1.20.4-fabric
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
melontini committed Apr 12, 2024
2 parents 0b1d530 + eb5f4ba commit 6a16f05
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ on:
jobs:
build:
runs-on: ubuntu-latest
if: |
!contains(github.event.head_commit.message, '[ci skip]')
steps:
- name: checkout repository
uses: actions/[email protected]
Expand Down Expand Up @@ -59,6 +61,11 @@ jobs:
java: |
17
github-tag: ${{ env.VERSION_PLAIN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
github-commitish: ${{ github.sha }}
github-prerelease: false

modrinth-id: etNS9OnA
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
modrinth-featured: true
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.5-SNAPSHOT'
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'maven-publish'
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ mod_version=0.11.1
maven_group=me.melontini
archives_base_name=recipe-book-is-pain

dark_matter=4.0.0-1.20.4-build.459
dark_matter=4.0.0-1.20.4-build.482
owo_version=0.12.5+1.20.3
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 6a16f05

Please sign in to comment.