wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into removeArch

Browse Source 
# Conflicts:
#	build.gradle
This commit is contained in:
coolGi
2024-02-18 12:01:02 +10:30
parent c84aac7e45 2e7cc9f4b6
commit 41f022df99
12 changed files with 85 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+8 -1
View File
@@ -192,6 +192,12 @@ subprojects { p ->
implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
// JOML
if (project.hasProperty("embed_joml") && embed_joml == "true")
forgeShadowMe("org.joml:joml:${rootProject.joml_version}")
else
implementation("org.joml:joml:${rootProject.joml_version}")
// JUnit tests
implementation("org.junit.jupiter:junit-jupiter:5.8.2")
implementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")
@@ -287,7 +293,8 @@ subprojects { p ->
// relocate "org.sqlite", "${librariesLocation}.sqlite"
// JOML
relocate "org.joml", "${librariesLocation}.joml"
if (project.hasProperty("embed_joml") && embed_joml == "true")
relocate "org.joml", "${librariesLocation}.joml"
// NightConfig (includes Toml & Json)
relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"