Merge remote-tracking branch 'origin/master'

2019-09-02 20:59:44 -04:00
parent b10656294e ef0b56eb22
commit 9bfb5216f9
12 changed files with 99 additions and 43 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -201,6 +201,7 @@ project(":core"){
    apply plugin: "java"

    task preGen{
+        outputs.upToDateWhen{ false } 
        generateLocales()
        writeVersion()
    }
@@ -321,4 +322,4 @@ task deployAll{
    dependsOn "desktop:packrMacOS"
    dependsOn "server:deploy"
    dependsOn "android:deploy"
-}
+}