From e06970eebbe2e115729f370ef0d9a753f83bc1c5 Mon Sep 17 00:00:00 2001
From: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Date: Sun, 9 Sep 2018 18:30:26 +0300
Subject: [PATCH 1/2] Create strings.xml (#217)

---
 android/res/values-ru/strings.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 android/res/values-ru/strings.xml

diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
new file mode 100644
index 0000000000..686a1ea4c7
--- /dev/null
+++ b/android/res/values-ru/strings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Mindustry</string>
+    <string-array name="donation_google_catalog_values">
+        <item>1 Доллар</item>
+        <item>2 Доллара</item>
+        <item>5 Доллара</item>
+        <item>10 Долларов</item>
+        <item>15 Долларов</item>
+        <item>25 Долларов</item>
+        <item>50 Долларов</item>
+    </string-array>
+
+</resources>

From abfaa47db26e30edc60c12b9f1cdac0ef775bcf3 Mon Sep 17 00:00:00 2001
From: iczero <iczero@users.noreply.github.com>
Date: Sun, 9 Sep 2018 11:38:29 -0700
Subject: [PATCH 2/2] Add version type/number/modifier to crash reports (#221)

---
 desktop/src/io/anuke/mindustry/desktop/CrashHandler.java | 3 +++
 server/src/io/anuke/mindustry/server/CrashHandler.java   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/desktop/src/io/anuke/mindustry/desktop/CrashHandler.java b/desktop/src/io/anuke/mindustry/desktop/CrashHandler.java
index 2dae41dd8e..53bcd7302f 100644
--- a/desktop/src/io/anuke/mindustry/desktop/CrashHandler.java
+++ b/desktop/src/io/anuke/mindustry/desktop/CrashHandler.java
@@ -37,6 +37,9 @@ public class CrashHandler{
         boolean fn = netActive, fs = netServer;
 
         //add all relevant info, ignoring exceptions
+        ex(() -> value.addChild("versionType", new JsonValue(Version.type)));
+        ex(() -> value.addChild("versionNumber", new JsonValue(Version.number)));
+        ex(() -> value.addChild("versionModifier", new JsonValue(Version.modifier)));
         ex(() -> value.addChild("build", new JsonValue(Version.build)));
         ex(() -> value.addChild("net", new JsonValue(fn)));
         ex(() -> value.addChild("server", new JsonValue(fs)));
diff --git a/server/src/io/anuke/mindustry/server/CrashHandler.java b/server/src/io/anuke/mindustry/server/CrashHandler.java
index 8e88d14500..3a78cb63eb 100644
--- a/server/src/io/anuke/mindustry/server/CrashHandler.java
+++ b/server/src/io/anuke/mindustry/server/CrashHandler.java
@@ -38,6 +38,9 @@ public class CrashHandler{
         JsonValue value = new JsonValue(ValueType.object);
 
         //add all relevant info, ignoring exceptions
+        ex(() -> value.addChild("versionType", new JsonValue(Version.type)));
+        ex(() -> value.addChild("versionNumber", new JsonValue(Version.number)));
+        ex(() -> value.addChild("versionModifier", new JsonValue(Version.modifier)));
         ex(() -> value.addChild("build", new JsonValue(Version.build)));
         ex(() -> value.addChild("mode", new JsonValue(Vars.state.mode.name())));
         ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name())));