diff --git a/common/build.gradle b/common/build.gradle index d06826840..3f3751086 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -30,5 +30,4 @@ publishing { dependencies { implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") - shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {} } \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index f8be4c323..4870a3ad7 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,9 +1,8 @@ plugins { id "com.github.johnrengelman.shadow" version "7.0.0" - id "com.modrinth.minotaur" version "1.2.1" } -version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm") +version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm") loom { accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener")) diff --git a/forge/build.gradle b/forge/build.gradle index c2408ada6..8154d9fcf 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -2,7 +2,7 @@ plugins { id "com.github.johnrengelman.shadow" version "7.0.0" } -version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm") +version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm") loom { accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener")) @@ -35,8 +35,8 @@ dependencies { // Starlight // modImplementation("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}") -// implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") -// forgeDependencies(shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}) +// implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") // This is already included with forge +// forgeDependencies(shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}) // This is already included with forge // forgeDependencies(project(":core")) { transitive false } @@ -96,7 +96,7 @@ shadowJar { configurations = [project.configurations.shadowMe] relocate 'org.tukaani', 'shaded.tukaani' relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress' -// relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig' +// relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig' // This is already included with forge relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common' diff --git a/gradle.properties b/gradle.properties index 0f4ae5bfc..792bc48dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,12 +5,12 @@ minecraft_version=1.17.1 archives_base_name=DistantHorizons mod_version=1.6.0a-pre maven_group=com.seibel.lod -toml_version=3.6.0 +toml_version=3.6.4 # Mod info mod_name=Distant Horizons mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow. -mod_authors=James Seibel, Leonardo Amato, Cola, coolGi2007, Ran +mod_authors=James Seibel, Leonardo Amato, Cola, coolGi2007, Ran, LeeTom # Fabric loader fabric_loader_version=0.12.6