diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c43154de..461253b6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Changes - Added links from quests directly to field guide entries (#854) @Zippity - Added a second EBF recipe but from LV furnaces @Pyritie +- Added GT machine recipes for maple/birch saps (#1524) @BlueBoat29 ### Bug fixes - Fixed chain conveyors not connecting (#1520) @BlueBoat29 - Fixed a crash when opening a world with a railgun logistics monitor (#1526) @Redeix diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index c30b7fdc6..e9aa74903 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -528,6 +528,7 @@ "item.tfg.universal_compost_browns": "Brown Universal Compost", "item.tfg.universal_compost_greens": "Green Universal Compost", "item.tfg.etching_diamond_tip": "Etching Diamond Tip", + "item.tfg.glacian_wool": "Glacian Ram Wool", "material.tfg.latex": "Latex", "material.tfg.vulcanized_latex": "Vulcanized Latex", "material.tfg.fluix": "Fluix", diff --git a/kubejs/assets/tfg/models/item/glacian_wool.json b/kubejs/assets/tfg/models/item/glacian_wool.json new file mode 100644 index 000000000..ec0ee6a1e --- /dev/null +++ b/kubejs/assets/tfg/models/item/glacian_wool.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/glacian_wool" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png index 62c58ba25..e843c9cb9 100644 Binary files a/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/glacian_wool.png b/kubejs/assets/tfg/textures/item/glacian_wool.png new file mode 100644 index 000000000..9c6fdd2fc Binary files /dev/null and b/kubejs/assets/tfg/textures/item/glacian_wool.png differ diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index a1d7d2d9c..618a1e1fc 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -269,7 +269,7 @@ const registerAdAstraRecipes = (event) => { .itemInputs( 'gtceu:carbon_fiber_mesh', '#forge:aerogels', - 'tfc:wool'//replace with glacian wool + 'tfg:glacian_wool' ) .itemOutputs('2x tfg:better_space_suit_fabric') .duration(20 * 5) diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index cce376227..722f42b09 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -246,6 +246,21 @@ const registerAFCRecipes = (event) => { //#endregion + //region gt sap processing + event.recipes.gtceu.fluid_heater('maple_sap_condense') + .inputFluids(Fluid.of('afc:maple_sap', 4000)) + .outputFluids(Fluid.of('afc:maple_syrup', 100)) + .duration(20*25) + .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.fluid_heater('birch_sap_condense') + .inputFluids(Fluid.of('afc:birch_sap', 8000)) + .outputFluids(Fluid.of('afc:birch_syrup', 100)) + .duration(20*35) + .EUt(GTValues.VA[GTValues.ULV]) + + + //endregion + event.recipes.gtceu.fluid_solidifier('maple_syrup') .inputFluids(Fluid.of('afc:maple_syrup', 100)) .itemOutputs('afc:maple_sugar') diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 58938b23d..12502a521 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -43,6 +43,13 @@ function registerTFGMiscellaneousRecipes(event) { event.recipes.tfc.pot('tfc:powder/charcoal', Fluid.of('tfg:conifer_pitch', 1000), 1200, 300) .itemOutput('tfg:conifer_rosin') .id('tfg:pot/conifer_pitch_to_rosin') + + event.recipes.gtceu.fluid_solidifier('tfg:pitch_to_rosin') + .inputFluids(Fluid.of('tfg:conifer_pitch', 1000)) + .itemInputs('tfc:powder/charcoal') + .itemOutputs('tfg:conifer_rosin') + .duration(20*24) + .EUt(GTValues.VA[GTValues.LV]) // Decorative Vases global.MINECRAFT_DYE_NAMES.forEach(color => { diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 6014b8c03..6049828a5 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -368,6 +368,7 @@ const registerTFGItems = (event) => { event.create('tfg:elite_power_thruster') event.create('tfg:better_space_suit_fabric') + event.create('tfg:glacian_wool') //endregion //#region Universal compost items