Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
IThundxr committed Sep 2, 2024
1 parent e1bf611 commit 224dacd
Show file tree
Hide file tree
Showing 11 changed files with 209 additions and 203 deletions.
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ subprojects {
maven("https://maven.parchmentmc.org") // Parchment mappings
maven("https://maven.quiltmc.org/repository/release") // Quilt Mappings
maven("https://maven.ithundxr.dev/releases") // Steam 'n' Rails Releases
maven("https://maven.ithundxr.dev/snapshots") // Steam 'n' Rails Snapshots
maven("https://maven.tterrag.com/") { // Flywheel
content {
// need to be specific here due to version overlaps
Expand Down
3 changes: 2 additions & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ dependencies {
modCompileOnly("net.fabricmc.fabric-api:fabric-api:${"fabric_api_version"()}")

// Steam 'n' Rails
modCompileOnly("com.railwayteam.railways:Steam_Rails-common-${"minecraft_version"()}:${"snr_version"()}+common-mc${"minecraft_version"()}") { isTransitive = false }
val buildNumber = if ("snr_build_number"() != "null") "-build." + "snr_build_number"() else ""
modCompileOnly("com.railwayteam.railways:Steam_Rails-common-${"minecraft_version"()}:${"snr_version"()}+common-mc${"minecraft_version"() + buildNumber}") { isTransitive = false }

// Carry On
modCompileOnly("tschipp.carryon:carryon-fabric-${"minecraft_version"()}:${"carryon_fabric_version"()}")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 1.20.1 2024-08-08T14:22:14.213110993 Create: Numismatics/Numismatics' Advancements
4ab84595dc44460d6d89ff3608940dd8694b93d6 data/numismatics/advancements/is_this_legal.json
645c92e6e449889ed4cf617432fd6fa87ffe355b data/numismatics/advancements/questionable_investment.json
// 1.20.1 2024-09-02T18:45:23.011620925 Create: Numismatics/Numismatics' Advancements
8f32fb49ef81058e2e660fac983dbef2f554db38 data/numismatics/advancements/root.json
645c92e6e449889ed4cf617432fd6fa87ffe355b data/numismatics/advancements/questionable_investment.json
894790d980b33b5cc24a21937c7db72bf0af1c5a data/numismatics/advancements/money_laundering.json
4ab84595dc44460d6d89ff3608940dd8694b93d6 data/numismatics/advancements/is_this_legal.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2024-08-08T14:22:14.204849223 Create: Numismatics/Numismatics EMI excluded tags
// 1.20.1 2024-09-02T18:45:23.008664281 Create: Numismatics/Numismatics EMI excluded tags
b57edab6f7e7a6e1b1211daa4c3b217ffd09ce62 assets/emi/tag/exclusions/numismatics.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// 1.20.1 2024-08-08T14:22:14.212185451 Create: Numismatics/Numismatics' Sequenced Assembly Recipes
// 1.20.1 2024-09-02T18:45:23.011438251 Create: Numismatics/Numismatics' Sequenced Assembly Recipes

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public class NumismaticsBlocks {
.initialProperties(SharedProperties::softMetal)
.properties(p -> p.strength(1.0F, 3600000.0F)) // Unexplodable
.properties(Properties::requiresCorrectToolForDrops)
.properties(p -> p.isRedstoneConductor(Blocks::never))
.properties(p -> p.isRedstoneConductor((state, getter, pos) -> false))
.transform(pickaxeOnly())
.lang("Salepoint")
.transform(BuilderTransformers.salepoint())
Expand Down
5 changes: 3 additions & 2 deletions fabric/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,10 @@ dependencies {
modLocalRuntime("dev.emi:emi-fabric:${"emi_version"()}")

// Steam 'n' Rails
modCompileOnly("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}") { isTransitive = false }
val buildNumber = if ("snr_build_number"() != "null") "-build." + "snr_build_number"() else ""
modCompileOnly("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"() + buildNumber}") { isTransitive = false }
if ("enable_snr"().toBoolean()) {
modLocalRuntime("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}") { isTransitive = false }
modLocalRuntime("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"() + buildNumber}") { isTransitive = false }
}

// Carry On
Expand Down
5 changes: 3 additions & 2 deletions forge/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ dependencies {
modLocalRuntime("mezz.jei:jei-${"minecraft_version"()}-forge:${"jei_version"()}")

// Steam 'n' Rails
modCompileOnly("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}") { isTransitive = false }
val buildNumber = if ("snr_build_number"() != "null") "-build." + "snr_build_number"() else ""
modCompileOnly("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"() + buildNumber}") { isTransitive = false }
if ("enable_snr"().toBoolean()) {
modLocalRuntime("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}") { isTransitive = false }
modLocalRuntime("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"() + buildNumber}") { isTransitive = false }
}

// Carry On
Expand Down
6 changes: 4 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ lazydfu_version = 0.1.3
jade_version = 11.10.0+fabric

# Steam 'n' Rails
snr_version = 1.6.4
enable_snr = true
# Leave snr_build_number as null if you want to use a release version
snr_version = 1.6.5
snr_build_number = 1442
enable_snr = false

# Carry On - https://github.com/Tschipp/CarryOn
carryon_forge_version = 2.1.2.7
Expand Down

0 comments on commit 224dacd

Please sign in to comment.