Merge branch 'master' into bot-system

2018-12-02 13:35:23 -08:00
parent bbded21afb 57a3330200
commit 1422b0a149
28 changed files with 376 additions and 118 deletions
@@ -111,7 +111,6 @@ jar {
 task proguard(type: ProguardTask) {
    url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
    extract 'proguard6.0.3/lib/proguard.jar'
-    versionManifest 'https://launchermeta.mojang.com/mc/game/version_manifest.json'
 }

 task createDist(type: CreateDistTask, dependsOn: proguard)