From bd27a96bdebb98b21229efcb8086db871650ce29 Mon Sep 17 00:00:00 2001 From: coolGi2007 Date: Tue, 22 Feb 2022 17:49:23 +1030 Subject: [PATCH] Updated the readme and updated the DHJarMerger (now marks the jar as an executable so linux users have an easier time when runnung the jar) --- Readme.md | 3 ++- plugins/DHJarMerger-1.0.jar | Bin 337529 -> 337924 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index d15d5056e..1bc131a58 100644 --- a/Readme.md +++ b/Readme.md @@ -55,7 +55,8 @@ It's better to use IntelliJ IDEA since Eclipse is not supported by Architectury, 2. Download the core from https://gitlab.com/jeseibel/distant-horizons-core and extract into a folder called `core` 3. Open a command line in the project folder 4. Run the command: `./gradlew assemble` -5. The compiled jar file will be in the folder `fabric/build/libs/` and `forge/build/libs/` +5. Then run command: `./gradlew mergeJars` +6. The compiled jar file will be in the folder `Merged` **If in terminal:** 1. `git clone -b 1.18.X --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git` diff --git a/plugins/DHJarMerger-1.0.jar b/plugins/DHJarMerger-1.0.jar index b089a52de3afaf7fcb8ebe10f82da52881145694..a38dae5e7db13ff0e1069cb8024b5be76cec5454 100644 GIT binary patch delta 8085 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 VHf*XS_~B