From 26bf03205cbaab9ba3cddb285a124e2f90ffdb5e Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 18 Apr 2026 11:25:22 -0500
Subject: [PATCH] build all scripts don't double-merge jars

jar merging handled automatically now
---
 buildAll     | 4 ----
 buildAll.bat | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/buildAll b/buildAll
index 2f54c55a5..3808fb95e 100755
--- a/buildAll
+++ b/buildAll
@@ -20,10 +20,6 @@ for d in versionProperties/*; do
   sh gradlew build -PmcVer=$version
   if [ $? != 0 ]; then continue; fi
 
-  echo "==================== Merging $version ===================="
-  sh gradlew mergeJars -PmcVer=$version
-  if [ $? != 0 ]; then continue; fi
-  
   echo "==================== Moving jar ===================="
   mv build/forgix/*.jar buildAllJars/
 done
diff --git a/buildAll.bat b/buildAll.bat
index 4ae1d35f6..cdbd0b323 100644
--- a/buildAll.bat
+++ b/buildAll.bat
@@ -20,9 +20,6 @@ for %%f in (versionProperties\*) do (
 	echo ==================== Building !version! ====================
     call .\gradlew.bat build -PmcVer="!version!"
     
-	echo ==================== Merging !version! ====================
-    call .\gradlew.bat mergeJars -PmcVer="!version!"
-	
     echo ==================== Moving jar ====================
     move build\forgix\*.jar buildAllJars\
 )