diff --git a/1.18.2.properties b/1.18.2.properties
index 1e78e4c32..308a8051c 100644
--- a/1.18.2.properties
+++ b/1.18.2.properties
@@ -1,6 +1,6 @@
 # 1.18.2 version based stuff
 
-java_version = 8
+java_version = 17
 minecraft_version=1.18.2
 parchment_version=2022.03.13
 compatible_minecraft_versions=["1.18.2"]
diff --git a/core b/core
index fb5cad3f1..1fc648737 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit fb5cad3f1473e539466fd5dbb4a08355ae33c9a6
+Subproject commit 1fc6487374d36adf6c355b3dda6ad35d408d20f2