From 8bd7556c89aa0dc5143d4019cdc189e2bd67ccbb Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sun, 23 Jan 2022 16:25:37 -0600
Subject: [PATCH] Add the dateTime to compiled jars and the commit to artifacts

---
 .gitlab-ci.yml     | 2 ++
 core               | 2 +-
 forge/build.gradle | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfb032a10..f459ede4d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,6 +70,7 @@ build:
             - .gradle
             - cache/
     artifacts:
+        name: "NightlyBuild-$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
         paths:
             # relative to the root directory
             - fabric/build/libs
@@ -108,6 +109,7 @@ merge:
             - .gradle
             - cache/
     artifacts:
+        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
         paths:
             # relative to the root directory
             - Merged
diff --git a/core b/core
index a5a4a3e6e..ab3880a5e 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit a5a4a3e6e25f27b7adb2211936aa16be3cd8349d
+Subproject commit ab3880a5e56b7238522fd598696e9fe5ee2f67b6
diff --git a/forge/build.gradle b/forge/build.gradle
index b95dd5258..1c33cd3ec 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.1.0"
 }
 
+version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH:mm")
+
 loom {
     accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
 
@@ -24,7 +26,7 @@ configurations {
 }
 
 repositories {
-    // Required for importing cursedforge mods
+    // Required for importing CurseForge mods
     maven {
         url "https://www.cursemaven.com"
         content {