From 4cf1d630dcf2eccb29464b8c2dce838d1e92bcb9 Mon Sep 17 00:00:00 2001
From: CodeF53 <37855219+CodeF53@users.noreply.github.com>
Date: Sat, 16 Apr 2022 12:44:36 -0600
Subject: [PATCH] Revert "Merge branch '1.17' into 1.18"

This reverts commit a4169dc5781cc863303d143668711f2233b8b590, reversing
changes made to f42525f99ab9f00c06198eb9c5389b468b8e8969.
---
 .github/FUNDING.yml                               |  1 -
 .github/workflows/build.yml                       |  2 +-
 gradle.properties                                 | 15 +++++++--------
 .../HorseBuff/mixin/PortalHorse/TickNether.java   |  2 +-
 src/main/resources/fabric.mod.json                |  6 +++---
 5 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index bfbfcbb..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-ko_fi: f53dev
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0e62292..f7478a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '16' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
diff --git a/gradle.properties b/gradle.properties
index ee1ab64..11f35a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,10 +2,10 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.17.1
-	yarn_mappings=1.17.1+build.64
-	loader_version=0.12.5
+	# check these on https://fabricmc.net/develop/
+	minecraft_version=1.18
+	yarn_mappings=1.18+build.1
+	loader_version=0.13.3
 
 # Mod Properties
 	mod_version = 1.2.3
@@ -13,7 +13,6 @@ org.gradle.jvmargs=-Xmx1G
 	archives_base_name = HorseBuff
 
 # Dependencies
-	fabric_version=0.41.0+1.17
-	cloth_config_version=5.0.38
-	mod_menu_version=2.0.14
-  
\ No newline at end of file
+	fabric_version=0.46.6+1.18
+	cloth_config_version=6.0.42
+	mod_menu_version=3.0.0
diff --git a/src/main/java/net/F53/HorseBuff/mixin/PortalHorse/TickNether.java b/src/main/java/net/F53/HorseBuff/mixin/PortalHorse/TickNether.java
index b26974c..a2763eb 100644
--- a/src/main/java/net/F53/HorseBuff/mixin/PortalHorse/TickNether.java
+++ b/src/main/java/net/F53/HorseBuff/mixin/PortalHorse/TickNether.java
@@ -92,4 +92,4 @@ public int netherPortalTime(int constant){
         }
         return constant;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 501a05e..84bc434 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -32,8 +32,8 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.11.3",
-    "minecraft": "1.17.x",
-    "java": ">=16",
+    "fabricloader": ">=0.13.3",
+    "minecraft": "1.18.x",
+    "java": ">=17"
   }
 }