Skip to content

Commit 24cd201

Browse files
committed
build: 1.21.9
1 parent f7c210f commit 24cd201

5 files changed

Lines changed: 14 additions & 20 deletions

File tree

current-upstream

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tag-5d52a3fd14332d2e47f1ef9f76d54c0cb91b5cbe
1+
tag-2a0aee354eba6352ff4adb483486825a7c97a710

patches/main/0001-Revert-feat-hardforking.patch

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ index 8132eca..0000000
1414
-[submodule "FlowSched"]
1515
- path = FlowSched
1616
- url = https://github.com/RelativityMC/FlowSched.git
17-
diff --git a/FlowSched b/FlowSched
18-
deleted file mode 160000
19-
index 5210232..0000000
20-
--- a/FlowSched
21-
+++ /dev/null
22-
@@ -1 +0,0 @@
23-
-Subproject commit 5210232ae17375c663aca4ea90b0f3528c55ca68
2417
diff --git a/README.md b/README.md
2518
index 5066ce5..a2c8095 100644
2619
--- a/README.md
@@ -120,7 +113,7 @@ index 5066ce5..a2c8095 100644
120113
+in 1.19 Folia. This is critical to allowing the chunk system to scale beyond 10 worker threads,
121114
+which is important for dedicated servers with more players to stress chunk generation.
122115
diff --git a/build.gradle b/build.gradle
123-
index b54942f..22e31b9 100644
116+
index 2692ecd..812f429 100644
124117
--- a/build.gradle
125118
+++ b/build.gradle
126119
@@ -22,7 +22,7 @@ def getGitCommit = { ->

patches/main/0002-Port-to-NeoForge.patch

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ Subject: [PATCH] Port to NeoForge
55

66

77
diff --git a/build.gradle b/build.gradle
8-
index 22e31b9..a9fa0e4 100644
8+
index 812f429..5edf3ff 100644
99
--- a/build.gradle
1010
+++ b/build.gradle
1111
@@ -1,5 +1,5 @@
1212
plugins {
13-
- id 'fabric-loom' version '1.10-SNAPSHOT'
14-
+ id 'dev.architectury.loom' version '1.10-SNAPSHOT'
13+
- id 'fabric-loom' version '1.11-SNAPSHOT'
14+
+ id 'dev.architectury.loom' version '1.11-SNAPSHOT'
1515
id 'maven-publish'
1616
id 'com.github.johnrengelman.shadow' version '8.1.1'
1717
}
@@ -75,7 +75,7 @@ index 22e31b9..a9fa0e4 100644
7575
}
7676

7777
diff --git a/gradle.properties b/gradle.properties
78-
index 923756c..64b6b20 100644
78+
index 0586a73..653ebba 100644
7979
--- a/gradle.properties
8080
+++ b/gradle.properties
8181
@@ -1,10 +1,11 @@
@@ -85,11 +85,12 @@ index 923756c..64b6b20 100644
8585
+loom.platform=neoforge
8686
# Fabric Properties
8787
# check these on https://modmuss50.me/fabric.html
88-
minecraft_version=1.21.8
89-
-loader_version=0.16.14
90-
+forge_version=21.8.0-beta
88+
-minecraft_version=1.21.9-rc1
89+
-loader_version=0.17.2
90+
+minecraft_version=1.21.9
91+
+forge_version=21.9.0-beta
9192
# Mod Properties
92-
mod_version=0.1.5.1
93+
mod_version=0.1.6
9394
maven_group=ca.spottedleaf.starlight
9495
diff --git a/settings.gradle b/settings.gradle
9596
index 72ebf6e..a2bc74d 100644
@@ -261,7 +262,7 @@ index a2d4826..68526da 100644
261262
if (emittedLight <= this.getLightLevel(pos.getX(), pos.getY(), pos.getZ())) {
262263
// some other source is brighter
263264
diff --git a/src/main/java/ca/spottedleaf/starlight/common/light/StarLightEngine.java b/src/main/java/ca/spottedleaf/starlight/common/light/StarLightEngine.java
264-
index e111453..4b80890 100644
265+
index 7fbc6af..8a397d4 100644
265266
--- a/src/main/java/ca/spottedleaf/starlight/common/light/StarLightEngine.java
266267
+++ b/src/main/java/ca/spottedleaf/starlight/common/light/StarLightEngine.java
267268
@@ -112,6 +112,7 @@ public abstract class StarLightEngine {

scripts/init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ basedir=$(pwd -P)
88
cd - || exit
99

1010
upstreamDir="ScalableLux"
11-
upstreamBranch="ver/1.21.8"
11+
upstreamBranch="ver/1.21.9"
1212

1313
function bashColor() {
1414
if [ "$2" ]; then

0 commit comments

Comments
 (0)