illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2026-02-02 00:07:54 +00:00
commit 8fe763fcce
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kubejs/server_scripts/macaws_for_tfc/recipes.js
View file

@ -23,4 +23,11 @@ function registerMacawsForTFCRecipes(event) {
C: `tfc:wood/log/${wood}`
}).id(`tfg:shaped/${wood}_wired_fence`)
})
event.remove({input: ['mcw_tfc_aio:roofs/gray_roofs/gray_roof_slab','#tfc:saws']})
event.shapeless('minecraft:gray_terracotta', [
'mcw_tfc_aio:roofs/gray_roofs/gray_roof_slab',
'mcw_tfc_aio:roofs/gray_roofs/gray_roof_slab'
]).id('minecraft:gray_terracotta')
}

8
kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js
View file

@ -465,7 +465,7 @@ const registerTFGGreenhouseRecipes = (event) => {
//#region Recipes
// Mushrooms
Ingredient.of('#beneath:mushrooms').stacks.forEach(element => {
Ingredient.of('#tfg:plants/beneath').stacks.forEach(element => {
generateGreenHouseRecipe(event, 'minecraft:the_nether', `8x ${element.id}`, [element.withCount(24), element.withCount(8)], 1);
});
@ -501,6 +501,10 @@ const registerTFGGreenhouseRecipes = (event) => {
});
generateGreenHouseRecipe(event, null, '8x minecraft:bamboo', ['64x minecraft:bamboo', '8x minecraft:bamboo'], 1);
generateGreenHouseRecipe(event, null, '8x tfc:food/fresh_seaweed', ['24x tfc:food/fresh_seaweed', '8x tfc:food/fresh_seaweed'], 1);
generateGreenHouseRecipe(event, 'minecraft:the_nether', '4x minecraft:glow_berries', ['20x minecraft:glow_berries', '4x minecraft:glow_berries'], 1);
// Mars Wood
generateGreenHouseRecipe(event, 'ad_astra:mars', '8x tfg:saplings/strophar', [
@ -547,4 +551,4 @@ const registerTFGGreenhouseRecipes = (event) => {
});
//#endregion
};
};

9
kubejs/server_scripts/tfg/beneath/tags.beneath.js
View file

@ -15,6 +15,10 @@ function registerTFGBeneathItemTags(event) {
event.add('tfc:plants', 'minecraft:spore_blossom')
event.remove('createaddition:plants', 'minecraft:moss_carpet')
event.add('tfg:plants/beneath', 'beneath:gleamflower')
event.add('tfg:plants/beneath', 'beneath:burpflower')
event.add('tfg:plants/beneath', '#beneath:mushrooms')
event.add('tfc:compost_greens', 'minecraft:red_mushroom_block')
event.add('tfc:compost_greens', 'minecraft:brown_mushroom_block')
event.add('tfc:compost_greens', 'minecraft:mushroom_stem')
@ -27,6 +31,9 @@ function registerTFGBeneathItemTags(event) {
function registerTFGBeneathBlockTags(event) {
event.add('tfg:lush_ground_replaceable', 'minecraft:deepslate')
event.add('tfg:lush_ground_replaceable', 'minecraft:blackstone')
event.remove('tfc:plants', 'beneath:gleamflower')
event.remove('tfc:plants', 'beneath:burpflower')
event.add('minecraft:lush_ground_replaceable', 'minecraft:blackstone')
event.add('beneath:nether_bush_plantable_on', 'minecraft:blackstone')
@ -136,4 +143,4 @@ function registerTFGBeneathPlacedFeatures(event) {
event.add('tfg:nether_underground_decoration', 'minecraft:spring_open')
event.add('tfg:nether_underground_decoration', 'minecraft:spring_closed')
event.add('tfg:nether_underground_decoration', 'tfg:nether/terrain/magma_blob')
}
}