From af1df167ed4dc6a850fdefe9acb6167faad5c5a2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 4 May 2025 09:35:18 -0400
Subject: [PATCH] Include date and build date in logs

---
 build.gradle                             | 3 +++
 core/src/mindustry/core/Version.java     | 5 ++++-
 core/src/mindustry/net/CrashHandler.java | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1b6977ef8f..eacfa41ded 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 buildscript{
     ext{
         arcHash = property("archash")
@@ -137,6 +139,7 @@ allprojects{
                 props["number"] = versionNumber
                 props["modifier"] = versionModifier
                 props["build"] = buildid
+                props["buildDate"] = new SimpleDateFormat("MMMM d, yyyy HH:mm a", Locale.getDefault()).format(new Date())
                 props["commitHash"] = "unknown"
                 if(project.hasProperty("showCommitHash")){
                     props["commitHash"] = getCommitHash()
diff --git a/core/src/mindustry/core/Version.java b/core/src/mindustry/core/Version.java
index c79594eebd..d8981d42c9 100644
--- a/core/src/mindustry/core/Version.java
+++ b/core/src/mindustry/core/Version.java
@@ -14,6 +14,8 @@ public class Version{
     public static String modifier = "unknown";
     /** Git commit hash (short) */
     public static String commitHash = "unknown";
+    /** Date that this version was built. */
+    public static String buildDate = "unknown";
     /** Number specifying the major version, e.g. '4' */
     public static int number;
     /** Build number, e.g. '43'. set to '-1' for custom builds. */
@@ -34,7 +36,8 @@ public class Version{
         type = map.get("type");
         number = Integer.parseInt(map.get("number", "4"));
         modifier = map.get("modifier");
-        commitHash = map.get("commitHash");
+        commitHash = map.get("commitHash", "unknown");
+        buildDate = map.get("buildDate", "unknown");
         if(map.get("build").contains(".")){
             String[] split = map.get("build").split("\\.");
             try{
diff --git a/core/src/mindustry/net/CrashHandler.java b/core/src/mindustry/net/CrashHandler.java
index 2ac952c3e6..f3d96061ad 100644
--- a/core/src/mindustry/net/CrashHandler.java
+++ b/core/src/mindustry/net/CrashHandler.java
@@ -29,7 +29,8 @@ public class CrashHandler{
         }
 
         return report
-        + "Version: " + Version.combined() + (Vars.headless ? " (Server)" : "") + "\n"
+        + "Version: " + Version.combined() + (Version.buildDate.equals("unknown") ? "" : " (Built " + Version.buildDate + ")") + (Vars.headless ? " (Server)" : "") + "\n"
+        + "Date: " + new SimpleDateFormat("MMMM d, yyyy HH:mm:ss a", Locale.getDefault()).format(new Date()) + "\n"
         + "OS: " + OS.osName + " x" + (OS.osArchBits) + " (" + OS.osArch + ")\n"
         + ((OS.isAndroid || OS.isIos) && app != null ? "Android API level: " + Core.app.getVersion() + "\n" : "")
         + "Java Version: " + OS.javaVersion + "\n"
@@ -64,7 +65,7 @@ public class CrashHandler{
 
             //don't create crash logs for custom builds, as it's expected
             if(OS.username.equals("anuke") && !"steam".equals(Version.modifier)){
-                System.exit(1);
+            //    System.exit(1);
             }
 
             //attempt to load version regardless