From 03da6d87b559f16037849dfecb6d3a1d54256f09 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 14 Jun 2023 19:43:04 -0500 Subject: [PATCH 1/4] Update coreSubProjects --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 24a335565..d502fd4da 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 24a335565ef5d225d1086bfb5c8cf36f7259cfb7 +Subproject commit d502fd4daa8e32e737849159cdd003ed2b2544af From 78c6fea3523340e55574c9860c6932fbe23a3c1a Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 14 Jun 2023 20:17:48 -0500 Subject: [PATCH 2/4] Add LZ4 to the readme --- Readme.md | 4 ++-- coreSubProjects | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index c0fbd7aed..bc068127f 100644 --- a/Readme.md +++ b/Readme.md @@ -161,8 +161,8 @@ To build all versions: `./buildAll` (all builds will end up in the `Merged` fold Forgix (To merge multiple mod versions into one jar) [_Used to be_ [_DHJarMerger_](https://github.com/Ran-helo/DHJarMerger)]\ https://github.com/PacifistMC/Forgix -XZ for Java (data compression)\ -https://tukaani.org/xz/java.html +LZ4 for Java (data compression)\ +https://github.com/lz4/lz4-java Json & Toml for Java (config handling)\ https://github.com/TheElectronWill/night-config diff --git a/coreSubProjects b/coreSubProjects index d502fd4da..6db6c6998 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit d502fd4daa8e32e737849159cdd003ed2b2544af +Subproject commit 6db6c6998391d7928cbaab6a7258c88303a8f562 From a65dc83721e22a7ce0772a9cd7c64e37048eaee4 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 14 Jun 2023 20:18:07 -0500 Subject: [PATCH 3/4] Update James' contact in the code_of_conduct --- code_of_conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code_of_conduct.md b/code_of_conduct.md index 3a6339e75..7e50ae9fc 100644 --- a/code_of_conduct.md +++ b/code_of_conduct.md @@ -56,7 +56,7 @@ a project may be further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the team lead James Seibel through Discord at `@BackSun#4157`. All +reported by contacting the team lead James Seibel through Discord at `@backsun`. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. From 2b1b54a646d2cfc789651bc34e65164d2479c7d5 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 14 Jun 2023 21:32:21 -0500 Subject: [PATCH 4/4] config renaming and add new configs to DhApi --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 6db6c6998..6832d21a3 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 6db6c6998391d7928cbaab6a7258c88303a8f562 +Subproject commit 6832d21a3b42e5a7b8e84a3c213c81ce155a5ed2