aboutsummaryrefslogtreecommitdiff
path: root/gradle/wrapper
diff options
context:
space:
mode:
authorTec <daniel112092@gmail.com>2019-12-04 18:24:12 +0100
committerTec <daniel112092@gmail.com>2019-12-04 18:24:12 +0100
commit0bbed0a069f9743b8af25cc3a5b53a93988b8bce (patch)
tree5c2386ac9a0792ba25641295d5e68e3f65db40ae /gradle/wrapper
parent330ff68dafde0480a318870f9a7f7b73a8032eb4 (diff)
parent7fcccbd00227a7cacb4707c0a8f4589a1e9ff436 (diff)
downloadGT5-Unofficial-0bbed0a069f9743b8af25cc3a5b53a93988b8bce.tar.gz
GT5-Unofficial-0bbed0a069f9743b8af25cc3a5b53a93988b8bce.tar.bz2
GT5-Unofficial-0bbed0a069f9743b8af25cc3a5b53a93988b8bce.zip
Merge branch 'master' of https://github.com/Technus/TecTech
# Conflicts: # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
Diffstat (limited to 'gradle/wrapper')
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
1 files changed, 2 insertions, 2 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e4af87c689..39c1bb6d1b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Dec 04 18:55:27 CET 2018
+#Sun Jul 21 17:13:31 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip