Merge remote-tracking branch 'origin/master'

2018-08-08 12:37:46 -04:00
parent cfc2239733 91552a3a2b
commit ad83a7dcc3
23 changed files with 70 additions and 30 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
        appName = 'Mindustry'
        gdxVersion = '1.9.8'
        roboVMVersion = '2.3.0'
-        uCoreVersion = '6a727b957e'
+        uCoreVersion = '9969ed07b1'

        getVersionString = {
            String buildVersion = getBuildVersion()