diff options
author | modmuss50 <modmuss50@gmail.com> | 2019-06-24 11:17:45 +0100 |
---|---|---|
committer | modmuss50 <modmuss50@gmail.com> | 2019-06-24 11:17:45 +0100 |
commit | 3e4ade38a7fa5968889e7f9879f750e1fd38def8 (patch) | |
tree | ca04a7a5b7a0180aad22185988d2db7aae382fb4 /gradle/wrapper | |
parent | 9f0cdbf1a4f0f3c704df1784369858cd73b2365f (diff) | |
parent | ee9991fdf123552b3ce65c4e5eab96c98263775a (diff) | |
download | architectury-loom-3e4ade38a7fa5968889e7f9879f750e1fd38def8.tar.gz architectury-loom-3e4ade38a7fa5968889e7f9879f750e1fd38def8.tar.bz2 architectury-loom-3e4ade38a7fa5968889e7f9879f750e1fd38def8.zip |
Merge branch 'pull/110' into dev/0.2.5
# Conflicts:
# gradle/wrapper/gradle-wrapper.properties
# src/main/java/net/fabricmc/loom/util/MixinRefmapHelper.java
Diffstat (limited to 'gradle/wrapper')
-rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 56177 -> 55190 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 29953ea1..87b738cb 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar |