Cleaned up enemy base walls

* Update of the Turkish Translation Bundle

Some words were wrong. Fixed in this version.

* Update bundle_tr.properties

.gitignore

@@ -3,6 +3,7 @@
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
 /core/assets/bundles/output/
+/core/assets/.gifimages/
 /deploy/
 /desktop/packr-out/
 /desktop/packr-export/

README.md

@@ -30,7 +30,7 @@ _Building:_ `./gradlew desktop:dist`
 ---
 
 Gradle may take up to several minutes to download files. Be patient. <br>
-After building, the output .JAR file should be in the output JAR file should be in `/desktop/build/libs/desktop-release.jar.`
+After building, the output .JAR file should be in `/desktop/build/libs/desktop-release.jar.`
 
 ### Downloads
 

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -60,11 +60,6 @@ public class AndroidLauncher extends PatchedAndroidApplication{
         Platform.instance = new Platform(){
             DateFormat format = SimpleDateFormat.getDateTimeInstance();
 
-            @Override
-            public boolean hasDiscord(){
-                return isPackageInstalled("com.discord");
-            }
-
             @Override
             public String format(Date date){
                 return format.format(date);

build.gradle

@@ -26,7 +26,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '1d353d76e9'
+        uCoreVersion = '64ec4a15148b27749ca7b505dea9743add9902f2'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
@@ -44,7 +44,7 @@ allprojects {
 
         generateLocales = {
             def output = '["en",'
-            def bundles = new File('core/assets/bundles/')
+            def bundles = new File(project(':core').projectDir, 'assets/bundles/')
             bundles.listFiles().each { other ->
                 if(other.name == "bundle.properties") return;
                 output += '"' + other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + '",'
@@ -54,7 +54,7 @@ allprojects {
         }
 
         writeVersion = {
-            def pfile = new File('core/assets/version.properties')
+            def pfile = new File(project(':core').projectDir, 'assets/version.properties')
             def props = new Properties()
 
             try{
@@ -127,24 +127,22 @@ project(":ios") {
     apply plugin: "robovm"
 
     task copyGen{
-        doFirst{
+        copy{
-            copy{
+            from ("core/build/classes/java/main/io/anuke/mindustry/gen/"){
-                from ("../core/build/classes/java/main/io/anuke/mindustry/gen/"){
+                include "**/*.java"
-                    include "**/*.java"
-                }
-
-                into "../core/src/io/anuke/mindustry/gen"
             }
+
+            into "ios/src/io/anuke/mindustry/gen"
         }
 
-        doLast{
+        doFirst{
             delete{
-                delete "../core/src/io/anuke/mindustry/gen/"
+                delete "ios/src/io/anuke/mindustry/gen/"
             }
         }
     }
 
-    build.finalizedBy(copyGen)
+    build.dependsOn(copyGen)
 
     dependencies {
         compile project(":core")
@@ -194,7 +192,9 @@ project(":server") {
     apply plugin: "java"
 
     configurations {
-        compile.exclude module: android
+        if(findProject(":android") != null){
+            compile.exclude module: android
+        }
     }
     
     dependencies {
@@ -229,9 +229,14 @@ project(":kryonet") {
     dependencies {
         compile project(":core")
         compile 'com.github.crykn:kryonet:2.22.1'
+        compile 'com.github.Anuken:WaifUPnP:05eb46bc577fd7674596946ba288c96c0cedd893'
     }
 }
 
+project(":reporter"){
+    apply plugin: "java"
+}
+
 tasks.eclipse.doLast {
     delete ".project"
 }