Merge branch 'untested' of https://git.adolin.xyz/saru/lobotomy-mod-pack into untested

2024-10-27 14:54:34 -05:00 · 2024-10-27 14:54:34 -05:00 · aefc4eae06
commit aefc4eae06
parent b361ff5a87 2245d8798b
1 changed files with 3 additions and 0 deletions
--- a/installer-windows.bat
+++ b/installer-windows.bat
@ -36,6 +36,7 @@ echo Updating...
        @timeout /t 2 >nul 2>&1
    
    tar -xvzf %mcroot%/mods.tar.gz -C %modfolder%
+<<<<<<< HEAD

 :::      :+++++=
 :::      -++++++.
@ -72,6 +73,8 @@ echo Updating...
 :::                                           ....

 for /f "delims=: tokens=*" %%A in ('findstr /b ::: "%~f0"') do @echo(%%A)
+=======
+>>>>>>> 2245d8798bc0de4d39bdc21bcede5eeb654c4f51
 echo Sigma!
 echo All done. C:
 echo This window will close in ten seconds.