Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.20.1' into 1.19.4
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
senseiwells committed Jul 4, 2024
2 parents 9bf1b44 + a1bc767 commit 8bc26f5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -426,9 +426,9 @@ following to your `build.gradle.kts`

```kts
repositories {
maven {
url = uri("https://jitpack.io")
}
maven("https://jitpack.io")
// For voicechat mod compatability
maven("https://maven.maxhenkel.de/repository/public")
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ repositories {
maven("https://masa.dy.fi/maven")
maven("https://jitpack.io")
maven("https://repo.viaversion.com")
maven("https://oss.sonatype.org/content/repositories/snapshots")
maven("https://api.modrinth.com/maven")
maven("https://maven.maxhenkel.de/repository/public")
mavenCentral()
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ systemProp.org.gradle.internal.http.socketTimeout=180000

kotlin.code.style=official

loomVersion=1.5-SNAPSHOT
loomVersion=1.6-SNAPSHOT

mcVersion=1.19.4
parchmentVersion=1.19.4:2023.06.26
loaderVersion=0.15.2
fabricKotlinVersion=1.9.2+kotlin.1.8.10
permissionsVersion=0.2-SNAPSHOT
permissionsVersion=0.3.1
fabricVersion=0.87.2+1.19.4
carpetVersion=1.4.101
voicechatVersion=1.19.4-2.5.7
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 8bc26f5

Please sign in to comment.