diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-09-24 11:53:57 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-09-24 11:59:18 +0800 |
| commit | 106896bce86f1984df7be0bda33aba93c8815c4a (patch) | |
| tree | 80467a55723325bbe30076f5ea616f060305567c /gradle | |
| parent | 20317a973895ad237fb58adc2b2b1ece8a45cea4 (diff) | |
| parent | 91cc0c43de61b97b54477f90710a45bc71b744b9 (diff) | |
| download | RoughlyEnoughItems-106896bce86f1984df7be0bda33aba93c8815c4a.tar.gz RoughlyEnoughItems-106896bce86f1984df7be0bda33aba93c8815c4a.tar.bz2 RoughlyEnoughItems-106896bce86f1984df7be0bda33aba93c8815c4a.zip | |
Merge branch '12.x-1.20' into 14.x-1.20.4
# Conflicts:
# build.gradle
# gradle/wrapper/gradle-wrapper.properties
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListWidget.java
Diffstat (limited to 'gradle')
| -rwxr-xr-x | 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 4b8cf416a..0b2225055 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip |