merge conflicts

This commit is contained in:
Martin Robertz committed 2025-10-02 16:04:31 +02:00
1 parent 47550d07df
commit 777e0cd7c1
3 files changed
+6 -7

No files matched your search

+4 -4
View File
@@ -1,13 +1,13 @@
// Add your dependencies here
dependencies {
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-688-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-700-GTNH:dev')
api('com.github.GTNewHorizons:Forgelin:2.0.3-GTNH')
api('com.github.GTNewHorizons:BuildCraft:7.1.44:dev')
api('com.github.GTNewHorizons:BuildCraft:7.1.45:dev')
// Some optional P2P tunnel support
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:api')
devOnlyNonPublishable('com.github.GTNewHorizons:OpenComputers:1.11.19-GTNH:dev') {transitive = false}
devOnlyNonPublishable('com.github.GTNewHorizons:OpenComputers:1.12.0-GTNH:dev') {transitive = false}
compileOnly('pneumaticCraft:PneumaticCraft-1.7.10:1.12.7-152:api') {transitive = false}
api('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.114-gtnh:dev') {transitive = false}
api('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.1-gtnh:dev') {transitive = false}
api('com.github.GTNewHorizons:Baubles-Expanded:2.1.15-GTNH:api')
}
Binary file not shown.
Vendored
+2 -3
View File
@@ -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.