Skip to content

Commit 7c75177

Browse files
committed
Merge branch '1.21.4' into 1.21.8
# Conflicts: # gradle.properties
2 parents fcefdb5 + a0d27f7 commit 7c75177

8 files changed

Lines changed: 13 additions & 17 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out repository
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
- name: Set up JDK 21
17-
uses: actions/setup-java@v4
17+
uses: actions/setup-java@v5
1818
with:
1919
java-version: '21'
2020
distribution: 'temurin'
@@ -23,7 +23,7 @@ jobs:
2323
run: chmod +x ./gradlew
2424

2525
- name: Setup Gradle
26-
uses: gradle/actions/setup-gradle@v4
26+
uses: gradle/actions/setup-gradle@v5
2727

2828
- name: Build Mod
2929
run: ./gradlew build

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Check out repository
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v5
1212

1313
- name: Set up JDK 21
14-
uses: actions/setup-java@v4
14+
uses: actions/setup-java@v5
1515
with:
1616
java-version: '21'
1717
distribution: 'temurin'
@@ -20,7 +20,7 @@ jobs:
2020
run: chmod +x ./gradlew
2121

2222
- name: Setup Gradle
23-
uses: gradle/actions/setup-gradle@v4
23+
uses: gradle/actions/setup-gradle@v5
2424

2525
- name: Build Mod
2626
run: ./gradlew build

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("fabric-loom") version "1.10-SNAPSHOT"
2+
id("fabric-loom") version "1.11-SNAPSHOT"
33
}
44

55
version = project.properties["mod_version"] as String

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ org.gradle.parallel=true
55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
77
minecraft_version=1.21.8
8-
loader_version=0.16.14
8+
loader_version=0.17.2
99

1010
# Mod Properties
1111
mod_version=1.0.4
1212
maven_group=com.zenith
1313
archives_base_name=ZenithProxyMod
1414

1515
# Dependencies
16-
fabric_version=0.129.0+1.21.8
16+
fabric_version=0.133.4+1.21.8

gradle/wrapper/gradle-wrapper.jar

1.71 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)