diff options
| author | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2021-01-31 15:57:17 +0200 |
|---|---|---|
| committer | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2021-01-31 15:57:17 +0200 |
| commit | f8909f14f02e36460c93d95e1b7b5bba1751aa82 (patch) | |
| tree | 5011822ca8fcb02756719ae6391572ca30d9f6fc /gradle | |
| parent | 47b811748a6cb1253c34f0b29bb1eb30ae523273 (diff) | |
| parent | b8ddfe1663ab9f6534e76dfe4fd13194bd31f0b9 (diff) | |
| download | LibGui-f8909f14f02e36460c93d95e1b7b5bba1751aa82.tar.gz LibGui-f8909f14f02e36460c93d95e1b7b5bba1751aa82.tar.bz2 LibGui-f8909f14f02e36460c93d95e1b7b5bba1751aa82.zip | |
Merge branch 'master' into unstable/4.0
# Conflicts:
# gradle.properties
# src/main/java/io/github/cottonmc/cotton/gui/widget/WLabeledSlider.java
Diffstat (limited to 'gradle')
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 290541c..28ff446 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |