diff --git a/build.gradle b/build.gradle index e57a16f..d05ddf4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,3 +3,10 @@ plugins { id 'com.gtnewhorizons.gtnhconvention' } +repositories { + maven { + name = "glee8e maven" + url = "https://maven.glease.net/repos/releases/" + } + +} diff --git a/dependencies.gradle b/dependencies.gradle index c874158..e620a40 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -69,7 +69,7 @@ dependencies { //gt BlockRenderer6343 compileOnly("com.github.GTNewHorizons:BlockRenderer6343:1.3.16:dev") - compileOnly('com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.59:dev') + compileOnly('com.github.GTNewHorizons:NewHorizonsCoreMod:2.7.260:dev') compileOnly('com.github.GTNewHorizons:nei-custom-diagram:1.7.1:dev') { transitive = false } // runtimeOnlyNonPublishable("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:0.5.22:dev") @@ -115,7 +115,7 @@ dependencies { // compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.28:dev') { transitive = false } // api("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.100-GTNH:dev") { transitive = false } // -// api("com.github.GTNewHorizons:Galacticraft:3.2.8-GTNH:dev") { transitive = false } +// api("com.github.GTNewHorizons:Galacticraft:3.3.12-GTNH:dev") { transitive = false } // api("com.github.GTNewHorizons:TinkersConstruct:1.12.16-GTNH:dev") // // api("com.github.GTNewHorizons:Chisel:2.15.3-GTNH:dev") { transitive = false } diff --git a/gradle.properties b/gradle.properties index 47db851..8948707 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ modId = ae2thing modGroup = com.asdflj.ae2thing # Whether to use modGroup as the maven publishing group. -# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. +# When false, com.github.GTNewHorizons is used. useModGroupForPublishing = false # Updates your build.gradle and settings.gradle automatically whenever an update is available. @@ -87,7 +87,9 @@ usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = -# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +# Specify the package that contains all of your Mixins. The package must exist or +# the build will fail. If you have a package property defined in your mixins..json, +# it must match with this or the build will fail. mixinsPackage = coremod.mixin # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! @@ -142,7 +144,7 @@ modrinthProjectId = # type can be one of [project, version], # and the name is the Modrinth project or version slug/id of the other mod. # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech -# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +# Note: UniMixins is automatically set as a required dependency if usesMixins = true. modrinthRelations = # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. @@ -163,6 +165,12 @@ curseForgeRelations = # projects. New projects should not use this parameter. # customArchiveBaseName = +# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory. +# runClientWorkingDirectory = run/client + +# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory. +# runServerWorkingDirectory = run/server + # Optional parameter to have the build automatically fail if an illegal version is used. # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. # The check is ONLY performed if the version is a git tag. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc25..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100644 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/settings.gradle b/settings.gradle index a9b2e2b..becf041 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,5 +17,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.33' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48' }