-
-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated Upstream (Gale/Purpur/Dependencies) & Fix build
Thanks DivineMC's commit: DivineMC/DivineMC@fa0b208
- Loading branch information
1 parent
f557681
commit c26a8e1
Showing
23 changed files
with
184 additions
and
175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Dreeam <[email protected]> | ||
Date: Tue, 21 May 2024 11:43:49 +0800 | ||
Subject: [PATCH] Rebrand | ||
|
||
|
||
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java | ||
index bdc8d830f54e4567ec0b03041221fdcd016ce76c..957f15a91f6aa1235c12b82079e32bb42449c78d 100644 | ||
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java | ||
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java | ||
@@ -25,6 +25,13 @@ public interface ServerBuildInfo { | ||
Key BRAND_GALE_ID = Key.key("galemc", "gale"); | ||
// Gale end - branding changes | ||
|
||
+ // Leaf start | ||
+ /** | ||
+ * The brand id for Leaf. | ||
+ */ | ||
+ Key BRAND_LEAF_ID = Key.key("winds-studio", "leaf"); | ||
+ // Leaf end | ||
+ | ||
/** | ||
* Gets the {@code ServerBuildInfo}. | ||
* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,20 +3,20 @@ From: Dreeam <[email protected]> | |
Date: Wed, 12 Oct 2022 10:42:15 -0400 | ||
Subject: [PATCH] Leaf Config | ||
|
||
TODO - Dreeam: Add header comment, world config | ||
TODO - Dreeam: Add header comment, world config, Bump Night Config to 3.7.1 | ||
|
||
Co-authored-by: MrHua269 <[email protected]> | ||
|
||
diff --git a/build.gradle.kts b/build.gradle.kts | ||
index 4ee48737f52e24f6e7148709068c568b36a736da..2200d656214d5db35d15a6fe145982c3fe8573cc 100644 | ||
index 4ee48737f52e24f6e7148709068c568b36a736da..f7c47c49b91952bf24995332b2d7d57a277b76cf 100644 | ||
--- a/build.gradle.kts | ||
+++ b/build.gradle.kts | ||
@@ -14,6 +14,9 @@ val alsoShade: Configuration by configurations.creating | ||
|
||
dependencies { | ||
implementation(project(":leaf-api")) // Gale start - project setup - Depend on own API // Leaf | ||
+ | ||
+ implementation("com.electronwill.night-config:toml:3.6.7") // Leaf - Night config | ||
+ implementation("com.electronwill.night-config:toml:3.6.7") // Leaf - Night config // Dreeam TODO: Bump to 3.7.1 | ||
+ | ||
// Paper start | ||
implementation("org.jline:jline-terminal-jansi:3.21.0") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.