From 17750691d619b93412fea4f89ec568c4f4888f38 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sun, 23 Jan 2022 20:52:28 -0600
Subject: [PATCH] comment out the jar versioning

---
 .gitlab-ci.yml      | 40 ++++++++++++++++++++--------------------
 fabric/build.gradle |  2 +-
 forge/build.gradle  |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c71e3e36c..2e2463bd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,26 +87,26 @@ build:
             # To ensure we've access to these files in the next stage
             dotenv: generate_jars.env
 
-## third stage
-#merge:
-#    stage: merge
-#    script: ./gradlew merge --gradle-user-home cache/ 
-#    # build using Java 17
-#    image: eclipse-temurin:17
-#    cache:
-#        key: "$CI_COMMIT_REF_NAME"
-#        policy: pull-push
-#        paths:
-#            - fabric/build/libs
-#            - forge/build/libs
-#            - build
-#            - .gradle
-#            - cache/
-#    artifacts:
-#        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
-#        paths:
-#            # relative to the root directory
-#            - Merged
+# third stage
+merge:
+    stage: merge
+    script: ./gradlew merge --gradle-user-home cache/ 
+    # build using Java 17
+    image: eclipse-temurin:17
+    cache:
+        key: "$CI_COMMIT_REF_NAME"
+        policy: pull-push
+        paths:
+            - fabric/build/libs
+            - forge/build/libs
+            - build
+            - .gradle
+            - cache/
+    artifacts:
+        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
+        paths:
+            # relative to the root directory
+            - Merged
 
 
 ## forth stage
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 63d4187d1..ca4b5fd1d 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id "com.modrinth.minotaur" version "1.2.1"
 }
 
-version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm")
+//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"))
diff --git a/forge/build.gradle b/forge/build.gradle
index 71b19e393..9113fa794 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -2,7 +2,7 @@ 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")
+//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"))