libreforge-updater

2023-01-13 18:08:44 +00:00
parent 1f30ca15d0 cb4e77d9e8
commit a9add130b3
2 changed files with 11 additions and 3 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -63,8 +63,13 @@ allprojects {
    }

    dependencies {
+<<<<<<< HEAD
        compileOnly 'com.willfp:eco:6.48.0'
-        implementation 'com.willfp:libreforge:3.126.3'
+        implementation 'com.willfp:libreforge:3.127.2'
+=======
+        compileOnly 'com.willfp:eco:6.44.0'
+        implementation 'com.willfp:libreforge:3.127.2'
+>>>>>>> cb4e77d9e83547c9726a3d68cedaec90d334f379
        implementation 'org.joml:joml:1.10.4'
        implementation 'com.willfp:ecomponent:1.3.0'

--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,7 @@
 #libreforge-updater
-#Mon Dec 26 14:01:33 CET 2022
-version=5.135.4
+#Fri Jan 13 18:08:44 GMT 2023
+=\=\=\=\=\=\=
+>>>>>>>=cb4e77d9e83547c9726a3d68cedaec90d334f379
+version=5.136.2
+<<<<<<<=HEAD
 plugin-name=Talismans