From c10af6dd0415aa7e760ab0f8c6e9dda76b8774f5 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Mon, 30 Jun 2025 07:46:18 -0500
Subject: [PATCH] fix build-all scripts

---
 buildAll     | 4 ++--
 buildAll.bat | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/buildAll b/buildAll
index 5f826736c..72ad0a208 100755
--- a/buildAll
+++ b/buildAll
@@ -22,7 +22,7 @@ for d in versionProperties/*; do
   echo "==================== Merging $version ===================="
   sh gradlew mergeJars -PmcVer=$version
   if [ $? != 0 ]; then continue; fi
-
+  
   echo "==================== Moving jar ===================="
-  mv Merged/*.jar buildAllJars/
+  mv build/merged/*.jar buildAllJars/
 done
diff --git a/buildAll.bat b/buildAll.bat
index 05067df2d..5dfeb4984 100644
--- a/buildAll.bat
+++ b/buildAll.bat
@@ -15,12 +15,15 @@ for %%f in (versionProperties\*) do (
     @rem Clean out the folders, build it, and merge it
     echo ==================== Cleaning workspace to build !version! ====================
     call .\gradlew.bat clean
-    echo ==================== Building !version! ====================
+    
+	echo ==================== Building !version! ====================
     call .\gradlew.bat build -PmcVer="!version!"
-    echo ==================== Merging !version! ====================
+    
+	echo ==================== Merging !version! ====================
     call .\gradlew.bat mergeJars -PmcVer="!version!"
+	
     echo ==================== Moving jar ====================
-    move Merged\*.jar buildAllJars\
+    move build\merged\*.jar buildAllJars\
 )
 
 endlocal