Skip to content

Commit

Permalink
bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
DeDiamondPro committed May 26, 2024
1 parent 6c8894f commit 89c67c2
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 12 deletions.
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ dependencies {
val elementaPlatform: String? by project
val universalPlatform: String? by project
val universalVersion = libs.versions.universal.get() + when {
project.platform.mcVersion == 12005 && platform.isFabric -> "+diamond.1.20.5"
project.platform.isNeoForge -> "+diamond.neoforge"
else -> ""
}
Expand Down Expand Up @@ -347,7 +346,7 @@ tasks {
// Function to get the range of mc versions supported by a version we are building for.
// First value is start of range, second value is end of range or null to leave the range open
fun getSupportedVersionRange(): Pair<String, String?> = when (platform.mcVersion) {
12005 -> "1.20.5" to null
12006 -> "1.20.5" to null
12004 -> "1.20.2" to "1.20.4"
12001 -> "1.20" to "1.20.1"
11904 -> "1.19.4" to "1.19.4"
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ kotlin = "1.9.23"
fabric_language_kotlin = "1.7.1+kotlin.1.6.10"

# Essential Dependencies
universal = "325"
elementa = "DIAMOND-8"
universal = "337"
elementa = "DIAMOND-9"

# Markdown
minemark = "1.0.2"
Expand Down
8 changes: 4 additions & 4 deletions root.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ preprocess {
val forge12004 = createNode("1.20.4-forge", 12004, "srg")

val neoforge12004 = createNode("1.20.4-neoforge", 12004, "srg")
val neoforge12005 = createNode("1.20.5-neoforge", 12005, "srg")
val neoforge12006 = createNode("1.20.6-neoforge", 12006, "srg")

val fabric11602 = createNode("1.16.2-fabric", 11602, "yarn")
val fabric11801 = createNode("1.18.2-fabric", 11802, "yarn")
val fabric11902 = createNode("1.19.2-fabric", 11902, "yarn")
val fabric11904 = createNode("1.19.4-fabric", 11904, "yarn")
val fabric12001 = createNode("1.20.1-fabric", 12001, "yarn")
val fabric12004 = createNode("1.20.4-fabric", 12004, "yarn")
val fabric12005 = createNode("1.20.5-fabric", 12005, "yarn")
val fabric12006 = createNode("1.20.6-fabric", 12006, "yarn")

forge11202.link(forge10809)
forge11602.link(forge11202, file("versions/1.12.2-forge-1.16.2-forge"))
Expand All @@ -52,13 +52,13 @@ preprocess {
forge12004.link(forge12001)

neoforge12004.link(forge12004)
neoforge12005.link(fabric12005)
neoforge12006.link(fabric12006)

fabric11602.link(forge11602)
fabric11801.link(fabric11602)
fabric11902.link(fabric11801)
fabric11904.link(fabric11902)
fabric12001.link(fabric11904)
fabric12004.link(fabric12001)
fabric12005.link(fabric12004)
fabric12006.link(fabric12004)
}
6 changes: 3 additions & 3 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pluginManagement {
maven("https://repo.polyfrost.org/releases")
mavenLocal()
}
val egtVersion = "0.5.0+neoforge1"
val egtVersion = "0.6.0"
plugins {
id("gg.essential.multi-version.root") version egtVersion
}
Expand Down Expand Up @@ -64,8 +64,8 @@ listOf(
"1.20.4-forge",
"1.20.4-neoforge",
"1.20.4-fabric",
"1.20.5-neoforge",
"1.20.5-fabric",
"1.20.6-neoforge",
"1.20.6-fabric",
).forEach { version ->
include(":$version")
project(":$version").apply {
Expand Down
1 change: 0 additions & 1 deletion versions/1.20.5-neoforge/gradle.properties

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
fabricApiVersion=0.97.6+1.20.5
irisVersion=1.7.0+1.20.5
elementaPlatform=1.18.1-fabric

essential.defaults.loom.minecraft=com.mojang:minecraft:1.20.5
essential.defaults.loom.mappings=net.fabricmc:yarn:1.20.5+build.1
Expand Down
4 changes: 4 additions & 0 deletions versions/1.20.6-neoforge/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
elementaPlatform=1.20.4-neoforge

kotlinForForgeVersion=5.0.1
essential.defaults.loom.neoForge=net.neoforged:neoforge:20.6.2-beta

0 comments on commit 89c67c2

Please sign in to comment.