Skip to content

Commit 2ca498e

Browse files
committed
Merge remote-tracking branch 'origin/QuestCraft-6.0.0' into QuestCraft-6.0.0
2 parents 9bc13f4 + fe285c8 commit 2ca498e

4 files changed

Lines changed: 7 additions & 9 deletions

File tree

.github/workflows/gradle.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ jobs:
2929
with:
3030
java-version: '11'
3131
distribution: 'temurin'
32-
- uses: nttld/setup-ndk@v1
33-
with:
34-
ndk-version: r21d
35-
local-cache: true
36-
link-to-sdk: true
3732
- uses: nttld/setup-ndk@v1
3833
with:
3934
ndk-version: r26b

devmods.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@
310310
},
311311
{
312312
"slug": "Fabric-Language-Kotlin",
313-
"version": "1.9.5+kotlin.1.8.22",
314-
"download_link": "https://cdn.modrinth.com/data/Ha28R6CL/versions/ADg3gvlr/fabric-language-kotlin-1.9.5%2Bkotlin.1.8.22.jar"
313+
"version": "1.13.3+kotlin.2.1.21",
314+
"download_link": "https://cdn.modrinth.com/data/Ha28R6CL/versions/iqWDz8qt/fabric-language-kotlin-1.13.3%2Bkotlin.2.1.21.jar"
315315
},
316316
{
317317
"slug": "Krypton",

mods.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@
310310
},
311311
{
312312
"slug": "Fabric-Language-Kotlin",
313-
"version": "1.9.5+kotlin.1.8.22",
314-
"download_link": "https://cdn.modrinth.com/data/Ha28R6CL/versions/ADg3gvlr/fabric-language-kotlin-1.9.5%2Bkotlin.1.8.22.jar"
313+
"version": "1.13.3+kotlin.2.1.21",
314+
"download_link": "https://cdn.modrinth.com/data/Ha28R6CL/versions/iqWDz8qt/fabric-language-kotlin-1.13.3%2Bkotlin.2.1.21.jar"
315315
},
316316
{
317317
"slug": "Krypton",

src/main/java/pojlib/util/JREUtils.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,9 @@ private static void writeDNS(Context ctx, File out) throws IOException {
291291
public static List<String> getJavaArgs(Context ctx, MinecraftInstances.Instance instance) {
292292
File resConfFile = new File(Constants.USER_HOME + "/hacks/resolv.conf");
293293
try {
294+
if(!resConfFile.exists()) {
295+
resConfFile.createNewFile();
296+
}
294297
writeDNS(ctx, resConfFile);
295298
} catch (IOException e) {
296299
Logger.getInstance().appendToLog("Couldn't write DNS servers! " + e.getMessage());

0 commit comments

Comments
 (0)