mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-03 22:34:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev

Browse source 
# Conflicts:
#	build.gradle
#	gradle.properties
This commit is contained in:
IThundxr 2025-03-02 13:57:26 -05:00
commit e0f7030d46
Failed to generate hash of commit
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build.gradle
View file

@ -136,15 +136,10 @@ repositories {
dependencies {
jarJar(implementation("com.tterrag.registrate:Registrate:${registrate_version}"))
jarJar("dev.engine-room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}") {
version {
strictly "[1.0.0-9,2.0)"
}
}
jarJar("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${flywheel_minecraft_version}:${flywheel_version}")
runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}")
jarJar(runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}"))
runtimeOnly("dev.engine-room.vanillin:vanillin-neoforge-${flywheel_minecraft_version}:${vanillin_version}")
if (ponderInWorkspace) {
@ -154,8 +149,6 @@ dependencies {
implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
}
jarJar("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
//compileOnly("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}")
//compileOnly("mezz.jei:jei-${jei_minecraft_version}-neoforge-api:${jei_version}")
implementation("mezz.jei:jei-${jei_minecraft_version}-neoforge:${jei_version}")

2
gradle.properties
View file

@ -26,7 +26,7 @@ flywheel_minecraft_version = 1.21.1
flywheel_version = 1.0.1-11
vanillin_version = 1.0.0-beta-11
flywheel_version_range = [1.0.0,2.0)
ponder_version = 1.0.39
ponder_version = 1.0.40
jei_minecraft_version = 1.21.1
jei_version = 19.21.0.247
curios_minecraft_version = 1.21.1