Merge remote-tracking branch 'origin/main'

# Conflicts:
#	coreSubProjects
This commit is contained in:
TomTheFurry
2023-06-15 16:42:07 +08:00
3 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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.