From f8d6797fc2a93466059dc63fdfb49a2cf4c5c483 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 17 Aug 2018 18:05:28 -0400
Subject: [PATCH] Fixed android module being necessary to compile

---
 build.gradle                          | 4 +++-
 core/assets/bundles/bundle.properties | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 018859d28f..c1987daf5b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -194,7 +194,9 @@ project(":server") {
     apply plugin: "java"
 
     configurations {
-        compile.exclude module: android
+        if(findProject(":android") != null){
+            compile.exclude module: android
+        }
     }
     
     dependencies {
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 8aacb8fdf7..e64bf7ddf8 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -357,7 +357,7 @@ setting.sfxvol.name=SFX Volume
 setting.mutesound.name=Mute Sound
 text.keybind.title=Rebind Keys
 
-category.general.name=Generalff
+category.general.name=General
 category.view.name=View
 category.multiplayer.name=Multiplayer