2 files changed, 7 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index c73f9ee7a4..234b54d2d2 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -497,14 +497,13 @@ public class Utils {
 		return true;
 	}
 
-	public static File getMcDir() {		
-		if (Minecraft.getMinecraft() == null) {
-			return new File("testdir");
-		}		
-		if ((MinecraftServer.getServer() != null) && MinecraftServer.getServer().isDedicatedServer()) {
-			return new File(".");
+	public static File getMcDir() {	
+		if (Utils.isClient()) {
+			if (Minecraft.getMinecraft() != null) {
+				return Minecraft.getMinecraft().mcDataDir;
+			}
 		}
-		return Minecraft.getMinecraft().mcDataDir;
+		return new File(".");
 	}
 
 	private static short cellID = 15;
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java
index ea161e4adb..01d0efac54 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java
@@ -50,7 +50,7 @@ public class LangUtils {
 	}
 
 	public static String trans(String aNr, String aEnglish) {
-		return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aNr, aEnglish, false);
+		return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_GTPP_" + aNr, aEnglish, false);
 	}
 	
 }