Merge branch 'main' of gitlab.com:jeseibel/minecraft-lod-mod

This commit is contained in:
James Seibel
2023-08-26 10:43:43 -05:00
3 changed files with 6 additions and 16 deletions
+1 -4
View File
@@ -193,8 +193,5 @@ https://github.com/lz4/lz4-java
NightConfig for Json & Toml (config handling)\
https://github.com/TheElectronWill/night-config
SVG Salamander for SVG support\
SVG Salamander for SVG support (not being used atm)\
https://github.com/blackears/svgSalamander
FlatLaf for Java Swing theming (for development testing, may remove later, and not included in compiled jars)\
https://www.formdev.com/flatlaf/
+4 -11
View File
@@ -223,12 +223,8 @@ subprojects { p ->
forgeShadowMe("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
forgeShadowMe("com.electronwill.night-config:json:${rootProject.nightconfig_version}")
// Theming
forgeShadowMe("com.formdev:flatlaf:${rootProject.flatlaf_version}")
// SVG
forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
forgeShadowMe("com.formdev:flatlaf-extras:${rootProject.flatlaf_version}")
// SVG (not needed atm)
// forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
// Netty
// Breaks 1.16.5
@@ -308,11 +304,8 @@ subprojects { p ->
// NightConfig (includes Toml & Json)
relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"
// Theming
relocate "com.formdev.flatlaf", "${librariesLocation}.formdev.flatlaf"
// SVG
relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg"
// SVG (not needed atm)
// relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg"
// Netty
relocate "io.netty", "${librariesLocation}.netty"