diff --git a/.gitignore b/.gitignore index 34ac7342..2205f810 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ src/main/resources/mixins.*([!.]).json *.bat *.DS_Store !gradlew.bat +layout.json diff --git a/dependencies.gradle b/dependencies.gradle index bd066948..2d7511c8 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,19 +2,19 @@ dependencies { api('com.github.GTNewHorizons:Baubles:1.0.4:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-527-GTNH:api') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-549-GTNH:api') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly('com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:Botania:1.12.6-GTNH:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.2:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:EnderStorage:1.7.0:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.4:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:EnderStorage:1.7.2:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:waila:1.8.2:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.13.7-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.13.10-GTNH:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.4-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.10-GTNH:api') {transitive=false} compileOnly('curse.maven:computercraft-67504:2269339') compileOnly('curse.maven:cofh-lib-220333:2388748') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..9bbc975c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c82..37f853b1 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.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d..faf93008 100755 --- 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 @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/settings.gradle b/settings.gradle index 7a562ea1..40fb369e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.31' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37' }