Skip to content

Commit 6a69c87

Browse files
committed
build: rebase on backports/26.1.2
1 parent 49989ca commit 6a69c87

8 files changed

Lines changed: 11 additions & 51 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: |
4747
cd ScalableLux-Patched
4848
./gradlew publishMods
49-
if: github.ref == 'refs/heads/port/neoforge/26.2.0'
49+
if: github.ref == 'refs/heads/port/neoforge/26.1.2'
5050
env:
5151
MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}
5252
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_API_TOKEN }}

ScalableLux

Submodule ScalableLux updated 71 files

current-upstream

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tag-5cd4f4ad216b2cf2935275d0550a63af8325d607
1+
tag-d3f47d8adc72e622aaeb386596a77cbf2dc4f188

patches/main/0001-Buildscript-setup.patch

Lines changed: 0 additions & 40 deletions
This file was deleted.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,22 @@ index c680a91..be3d070 100644
6868
def envType = System.getenv("OVERRIDE_RELEASE_TYPE")
6969
type = envType != null ? me.modmuss50.mpp.ReleaseType.valueOf(envType) : me.modmuss50.mpp.ReleaseType.ALPHA
7070
diff --git a/gradle.properties b/gradle.properties
71-
index e1101d3..01eefd7 100644
71+
index 89bc5f6..485bbef 100644
7272
--- a/gradle.properties
7373
+++ b/gradle.properties
7474
@@ -4,10 +4,10 @@ org.gradle.daemon=false
7575
# Fabric Properties
7676
# check these on https://modmuss50.me/fabric.html
77-
minecraft_version=26.2
77+
minecraft_version=26.1.2
7878
-loader_version=0.19.3
79-
+forge_version=26.2.0.7-beta
79+
+forge_version=26.1.2.77
8080
# Mod Properties
8181
mod_version=0.3.0-alpha.0
8282
maven_group=ca.spottedleaf.starlight
8383
-archives_base_name=ScalableLux-fabric
8484
+archives_base_name=ScalableLux-neoforge
8585

86-
curseforge_minecraft_versions=26.2
86+
curseforge_minecraft_versions=26.1.2
8787
diff --git a/settings.gradle b/settings.gradle
8888
index 72ebf6e..344d01a 100644
8989
--- a/settings.gradle

scripts/apply.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function enableCommitSigningIfNeeded {
7979
}
8080

8181
(
82-
(applyPatch ScalableLux ScalableLux-Patched HEAD main) || exit 1
82+
(applyPatch ScalableLux/ScalableLux-Patched ScalableLux-Patched HEAD main) || exit 1
8383
enableCommitSigningIfNeeded
8484
) || (
8585
echo "Failed to apply patches"

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/26.2.0"
11+
upstreamBranch="backports/26.1.2"
1212

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

scripts/upstream.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ echo "$tag" >"$basedir"/current-upstream
2727

2828
cd "${upstreamDir}/" || exit
2929

30-
#./build.sh up || exit
31-
#./build.sh p || exit
30+
./build.sh up || exit
31+
./build.sh p || exit
3232

3333
function tag() {
3434
(

0 commit comments

Comments
 (0)