diff --git a/Readme.md b/Readme.md index 6875690be..48e52f592 100644 --- a/Readme.md +++ b/Readme.md @@ -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/ diff --git a/build.gradle b/build.gradle index f40fda823..7b19a6a3d 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/coreSubProjects b/coreSubProjects index cfa00010d..f8857d2a1 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit cfa00010d903539d72a3c7007dc072cc0d1861cf +Subproject commit f8857d2a1d11a169816b702d1eda31afec3d3d3a