diff --git a/CHANGELOG.md b/CHANGELOG.md index b9df31bbf..f0dbf3208 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Bug fixes - Fixed double ingots not having a temperature (#1165) @Pyritie ### Changes +- Changed pineapple yarn recipe from assembler to wiremill & coiling machine, like the other strings (#1162) @Pyritie ## [0.9.11] - 13.06.2025 ### New features diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 90d2e64f0..38e8f5165 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -95,16 +95,8 @@ const registerFirmaLifeRecipes = (event) => { .duration(50) .EUt(2) - // Pineapple Fiber - event.recipes.gtceu.assembler(`tfg:firmalife/pineapple_fiber`) - .itemInputs('firmalife:food/pineapple') - .circuit(1) - .itemOutputs('firmalife:pineapple_fiber') - .duration(50) - .EUt(7) - // Pineapple Yarn - event.recipes.gtceu.assembler(`tfg:firmalife/pineapple_yarn`) + event.recipes.gtceu.wiremill(`tfg:firmalife/pineapple_yarn`) .itemInputs('firmalife:pineapple_fiber') .circuit(1) .itemOutputs('8x firmalife:pineapple_yarn') diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 14ef74306..ae5b6d315 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -627,6 +627,13 @@ function registerVintageImprovementsRecipes(event) { processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/coiling/phantom_thread`) + event.custom({ + type: 'vintageimprovements:coiling', + ingredients: [{ item: 'firmalife:pineapple_fiber' }], + results: [{ item: 'firmalife:pineapple_yarn', count: 8 }], + processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER + }).id(`tfg:vi/coiling/pineapple_yarn`) + event.custom({ type: 'vintageimprovements:coiling', ingredients: [ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Polycaprolactam, 1)],