From c620e2cf9e0f4df84912a26f63272196876f1089 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Fri, 6 Nov 2020 15:10:26 +0100 Subject: [PATCH] Update to MC 1.16.4 (closes #406) --- build.gradle.kts | 2 +- jGui | 2 +- settings.gradle.kts | 4 ++-- versions/common.gradle | 6 +++++- versions/mainProject | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 11134609..e91e2915 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -178,7 +178,7 @@ val doRelease by tasks.registering { defaultTasks("shadowJar") preprocess { - "1.16.3"(11603, "yarn") { + "1.16.4"(11604, "yarn") { "1.16.1"(11601, "yarn") { "1.15.2"(11502, "yarn") { "1.14.4"(11404, "yarn", file("versions/mapping-fabric-1.15.2-1.14.4.txt")) { diff --git a/jGui b/jGui index afe093a3..6b16892d 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit afe093a35f43c340b52ad26037b443ff146a15fe +Subproject commit 6b16892d6489bf28cbf6945329f71c2effb52bc2 diff --git a/settings.gradle.kts b/settings.gradle.kts index c5b02983..355bcbc5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,7 +29,7 @@ val jGuiVersions = listOf( "1.14.4", "1.15.2", "1.16.1", - "1.16.3" + "1.16.4" ) val replayModVersions = listOf( "1.7.10", @@ -46,7 +46,7 @@ val replayModVersions = listOf( "1.14.4", "1.15.2", "1.16.1", - "1.16.3" + "1.16.4" ) include(":jGui") diff --git a/versions/common.gradle b/versions/common.gradle index ef679e0e..11bba57d 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -226,24 +226,28 @@ dependencies { 11502: '1.15.2', 11601: '1.16.1', 11603: '1.16.3', + 11604: '1.16.4', ][mcVersion] mappings 'net.fabricmc:yarn:' + [ 11404: '1.14.4+build.16', 11502: '1.15.2+build.14', 11601: '1.16.1+build.17:v2', 11603: '1.16.3+build.1:v2', + 11604: '1.16.4+build.6:v2', ][mcVersion] modCompile 'net.fabricmc:fabric-loader:' + [ 11404: '0.7.8+build.189', 11502: '0.7.8+build.189', 11601: '0.8.8+build.202', 11603: '0.9.1+build.205', + 11604: '0.10.6+build.214', ][mcVersion] def fabricApiVersion = [ 11404: '0.4.3+build.247-1.14', 11502: '0.5.1+build.294-1.15', 11601: '0.14.0+build.371-1.16', 11603: '0.17.1+build.394-1.16', + 11604: '0.25.1+build.416-1.16', ][mcVersion] def fabricApiModules = [ "api-base", @@ -305,7 +309,7 @@ dependencies { shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' - shadow "com.github.ReplayMod:ReplayStudio:919db4e", shadeExclusions + shadow "com.github.ReplayMod:ReplayStudio:830678c", shadeExclusions implementation(jGui){ transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those diff --git a/versions/mainProject b/versions/mainProject index b8ae5a5b..709c55fe 100644 --- a/versions/mainProject +++ b/versions/mainProject @@ -1 +1 @@ -1.16.3 \ No newline at end of file +1.16.4 \ No newline at end of file