diff --git a/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version b/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version index 51a0f92d8b..b878cc20c0 100644 --- a/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version +++ b/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version @@ -1 +1 @@ -1713398722142 \ No newline at end of file +1713403084937 \ No newline at end of file diff --git a/app_solcraftlauncher/src/main/assets/components/forge_installer/version b/app_solcraftlauncher/src/main/assets/components/forge_installer/version index 32ccb8814f..2bc493a6d5 100644 --- a/app_solcraftlauncher/src/main/assets/components/forge_installer/version +++ b/app_solcraftlauncher/src/main/assets/components/forge_installer/version @@ -1 +1 @@ -1713398722416 \ No newline at end of file +1713403084999 \ No newline at end of file diff --git a/app_solcraftlauncher/src/main/assets/components/lwjgl3/version b/app_solcraftlauncher/src/main/assets/components/lwjgl3/version index cc068ea917..26bcafcc95 100644 --- a/app_solcraftlauncher/src/main/assets/components/lwjgl3/version +++ b/app_solcraftlauncher/src/main/assets/components/lwjgl3/version @@ -1 +1 @@ -1713398722692 \ No newline at end of file +1713403085043 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7710..033e24c4cd 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 a363877439..62f495dfed 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d421c..fcb6fca147 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +130,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in