From 2697275ad6f6f9d3f11f9bce640bbda40020c654 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Sat, 26 Oct 2024 19:23:43 -0400 Subject: [PATCH] fixed some compile errors on forge side, updated tesseract --- TesseractAPI | 2 +- forge/build.gradle | 4 +++- settings.gradle | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TesseractAPI b/TesseractAPI index e2dd22a7c..f67706a15 160000 --- a/TesseractAPI +++ b/TesseractAPI @@ -1 +1 @@ -Subproject commit e2dd22a7cf869765ad002c1544dfb9fcc13e3c3d +Subproject commit f67706a157abc799f8e1fabbec082291aace1b20 diff --git a/forge/build.gradle b/forge/build.gradle index b0f4b9672..e2ba91e20 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -94,7 +94,6 @@ dependencies { implementation fg.deobf(include("earth.terrarium:botarium-forge-1.18.2:${project.botarium_version}")) implementation fg.deobf(include("org.gt-reimagined:structurelib-forge:${project.structurelib_version}-${project.minecraft_version}")) implementation fg.deobf(include("com.teamresourceful.resourcefullib:resourcefullib-forge-1.18.2:${project.resourcefullib_version}")) - implementation fg.deobf(include("io.github.llamalad7:mixinextras-forge:0.2.0-beta.11")) implementation(fg.deobf("maven.modrinth:carbon-config:${project.carbon_config_forge_version}")) jarJar("maven.modrinth:carbon-config:${project.carbon_config_forge_version}"){ jarJar.ranged(it, "[1.18.2-1.2.6,)") @@ -107,6 +106,9 @@ dependencies { implementation(jarJar("io.github.llamalad7:mixinextras-forge:0.4.1")) { jarJar.ranged(it, "[0.4.1,)") } + compileOnly fg.deobf("com.simibubi.create:create-${minecraft_version}:0.5.1.i-435:all"){ + transitive = false + } //include("org.jetbrains.kotlin:kotlin-reflect:${kotlin.coreLibrariesVersion}") //include("org.jetbrains.kotlin:kotlin-stdlib:${kotlin.coreLibrariesVersion}") //include("org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin.coreLibrariesVersion}") diff --git a/settings.gradle b/settings.gradle index 690e0fc44..612116347 100644 --- a/settings.gradle +++ b/settings.gradle @@ -34,8 +34,8 @@ project(':tesseract-fabric').setProjectDir(new File("TesseractAPI/fabric")) include("antimatter-common") include("antimatter-fabric") -//include("antimatter-forge") +include("antimatter-forge") project(':antimatter-common').setProjectDir(new File("common")) -//project(':antimatter-forge').setProjectDir(new File("forge")) +project(':antimatter-forge').setProjectDir(new File("forge")) project(':antimatter-fabric').setProjectDir(new File("fabric")) \ No newline at end of file