Skip to content

Commit

Permalink
Merge branch 'Winds-Studio:ver/1.21.1' into ver/1.21.1
Browse files Browse the repository at this point in the history
  • Loading branch information
HaHaWTH authored Nov 28, 2024
2 parents f5aad15 + 4e9546a commit 77de601
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = cn.dreeam.leaf
mcVersion = 1.21.1
version = 1.21.1-R0.1-SNAPSHOT

galeCommit = 751637d4db10bf5e153dcd93b239ec5793811ad9
galeCommit = 13ab1512e5de55c11e6e8b164cdfb6c645e22925

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
9 changes: 3 additions & 6 deletions patches/server/0016-Bump-Dependencies.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Bump Dependencies
TODO - Dreeam: Bump & test dependencies, impl new features?

diff --git a/build.gradle.kts b/build.gradle.kts
index 0d250a691a0f28770cbd9f847d8cd00af866b583..bde62a062732d93955f4d0f491d3ec5d9fd30842 100644
index d1bcbd39120480b2e1e402040d20b8567019a4b0..e210eba6fffa984652134d39d2bc1020744667b0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
Expand Down Expand Up @@ -82,12 +82,9 @@ index 0d250a691a0f28770cbd9f847d8cd00af866b583..bde62a062732d93955f4d0f491d3ec5d
implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins
// Paper start - Remap reflection
@@ -77,8 +81,10 @@ dependencies {
// Paper end - Remap reflection
// Paper start - spark
@@ -79,6 +83,8 @@ dependencies {
implementation("me.lucko:spark-api:0.1-20240720.200737-2")
- implementation("me.lucko:spark-paper:1.10.105-SNAPSHOT")
+ implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT") // Leaf - Bump Dependencies
implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT")
// Paper end - spark
+
+ implementation("io.netty:netty-all:4.1.114.Final") // Leaf - Bump Dependencies // Dreeam TODO - Update to 4.2.0
Expand Down

0 comments on commit 77de601

Please sign in to comment.