Skip to content

Commit aa2e30e

Browse files
committed
Fix CrT integration and use OIngredientWithAmount and CTFluidIngredient as how we interact with CT instead of using our own wrappers
1 parent 114d94b commit aa2e30e

File tree

76 files changed

+708
-1423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+708
-1423
lines changed

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,7 @@ dependencies {
417417

418418
def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${minecraft_version}:${crafttweaker_version}"
419419
compileOnly(crt)
420-
//TODO: Re-enable when it updates
421-
//localRuntime(crt)
420+
localRuntime(crt)
422421
def jeiTweaker = "com.blamejared.jeitweaker:JeiTweaker-forge-${previous_minecraft_version}:${jeitweaker_version}"
423422
compileOnly(jeiTweaker)
424423
//TODO: Re-enable when it updates

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ yamlops_version=1.2.0
3737

3838
#Mod dependencies
3939
cc_tweaked_version=1.111.0
40-
crafttweaker_version=19.0.2
40+
crafttweaker_version=19.0.3
4141
curios_version=8.0.0-beta.5+1.20.6
4242
emi_version=1.1.6
4343
jade_api_id=5288706

src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/.cache/ef8afc58605d80c9d65a76a4a1dfdcbfe41be362

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipes/compat/biomesoplenty/biofuel/tiny_cactus.json

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/scripts/mekanism/combining.zs

Lines changed: 3 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/scripts/mekanism/compressing.zs

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/scripts/mekanism/crushing.zs

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/scripts/mekanism/dissolution.zs

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/scripts/mekanism/energy_conversion.zs

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)