diff --git a/jGui b/jGui index da053ac4..9e297620 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit da053ac4cec4222824ad80c19bfd140b9096b2f1 +Subproject commit 9e297620ef3eb1e7f00f5e3f33ac5deda63c4fe5 diff --git a/settings.gradle b/settings.gradle index a702e191..304d751d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,7 @@ jGuiVersions += [ '1.9.4', '1.12', '1.13.2', - '1.14.1', + '1.14.2', ] replayModVersions += [ '1.7.10', @@ -28,7 +28,7 @@ replayModVersions += [ '1.12.1', '1.12.2', '1.13.2', - '1.14.1', + '1.14.2', ] include ':jGui' diff --git a/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java b/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java index 6b76e736..ce05f2bb 100644 --- a/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java +++ b/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java @@ -11,7 +11,7 @@ public enum MinecraftVersion { MC_1_12_1("Minecraft 1.12.1", "1.12.1"), MC_1_12_2("Minecraft 1.12.2", "1.12.2"), MC_1_13_2("Minecraft 1.13.2", "1.13.2"), - MC_1_14("Minecraft 1.14", "1.14"); + MC_1_14_2("Minecraft 1.14.2", "1.14.2"); private String niceName, apiName; diff --git a/versions/1.14.1/mapping.txt b/versions/1.14.2/mapping.txt similarity index 100% rename from versions/1.14.1/mapping.txt rename to versions/1.14.2/mapping.txt diff --git a/versions/common.gradle b/versions/common.gradle index 0444eb04..38bcc295 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -206,16 +206,16 @@ def shadeExclusions = { dependencies { if (FABRIC) { minecraft 'com.mojang:minecraft:' + [ - 11401: '1.14.1' + 11402: '1.14.2' ][mcVersion] mappings 'net.fabricmc:yarn:' + [ - 11401: '1.14.1+build.10' + 11402: '1.14.2+build.2' ][mcVersion] modCompile 'net.fabricmc:fabric-loader:' + [ - 11401: '0.4.7+build.147' + 11402: '0.4.8+build.154' ][mcVersion] modCompile 'net.fabricmc.fabric-api:fabric-api:' + [ - 11401: '0.3.0-pre+build.157' + 11402: '0.3.0+build.170' ][mcVersion] } @@ -251,7 +251,7 @@ dependencies { def studioVersion = mcVersionStr if (studioVersion == '1.8.9') studioVersion = '1.8' - shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:7400a59", shadeExclusions + shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:e6f1a4b", shadeExclusions shadowReobf(project(":jGui:$jGuiVersion")){ 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/core/mcVersion b/versions/core/mcVersion index 53f4e310..f7dff338 100644 --- a/versions/core/mcVersion +++ b/versions/core/mcVersion @@ -1 +1 @@ -11401 \ No newline at end of file +11402 \ No newline at end of file