Merge remote-tracking branch 'origin/mechs-balance-altfire' into mechs-balance-altfire

# Conflicts: # core/src/io/anuke/mindustry/content/Mechs.java
2018-08-24 13:58:32 -04:00
parent 94805259d7 e796d44f92
commit 8b0bbffe27
7 changed files with 39 additions and 7 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
        appName = 'Mindustry'
        gdxVersion = '1.9.8'
        roboVMVersion = '2.3.0'
-        uCoreVersion = '7053ba9c265d9743593063080c1bf8ce243c3827'
+        uCoreVersion = 'f5cecd22475aedd70af8d6378f9061e8967403de'

        getVersionString = {
            String buildVersion = getBuildVersion()