From 9fa5adf3954e7c567ee0500d140e75fc25223a2c Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Wed, 1 Dec 2021 13:01:12 +0100
Subject: [PATCH] Bump to MC 1.18

---
 build.gradle | 6 +++---
 jGui         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 838af31c..0f5e811b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -243,7 +243,7 @@ dependencies {
                 11604: '1.16.4',
                 11700: '1.17',
                 11701: '1.17.1',
-                11800: '1.18-rc4',
+                11800: '1.18',
         ][mcVersion]
         mappings 'net.fabricmc:yarn:' + [
                 11404: '1.14.4+build.16',
@@ -253,7 +253,7 @@ dependencies {
                 11604: '1.16.4+build.6:v2',
                 11700: '1.17+build.13:v2',
                 11701: '1.17.1+build.29:v2',
-                11800: '1.18-rc4+build.1:v2',
+                11800: '1.18+build.1:v2',
         ][mcVersion]
         modImplementation 'net.fabricmc:fabric-loader:0.12.5'
         def fabricApiVersion = [
@@ -335,7 +335,7 @@ dependencies {
 
     shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
 
-    shadow "com.github.ReplayMod:ReplayStudio:69b1296", shadeExclusions
+    shadow "com.github.ReplayMod:ReplayStudio:8cfd22c", shadeExclusions
 
     implementation(FABRIC ? dependencies.project(path: jGui.path, configuration: "namedElements") : 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/jGui b/jGui
index 37b1273b..3ac431cf 160000
--- a/jGui
+++ b/jGui
@@ -1 +1 @@
-Subproject commit 37b1273be49e7780438088f220111b44c19e4e9b
+Subproject commit 3ac431cfa983009d4785f8962fdc8e0cc49eb825