Merge branch 'master' into dev

# Conflicts: # dependencies.gradle
GTNewHorizons · Apr 30, 2024 · 56846a4 · 56846a4
2 parents a962526 + 9477297
commit 56846a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.162-pre:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.01-pre:dev')
     api("com.github.GTNewHorizons:bartworks:0.9.21:dev")
 
     implementation('curse.maven:cofh-core-69162:2388751')

diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.21'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
 }