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 2025-10-30 23:00:58 +00:00
commit b1da4adad6
14 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json
View file

@ -18,7 +18,7 @@
"title": "Maple",
"item": "tfc:wood/log/maple,tfc:wood/wood/maple,tfc:wood/leaves/maple,tfc:wood/sapling/maple",
"link_recipe": false,
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): -8.4°C$(br)$(thing)Maximum Temperature$(): 8°C$(br)$(thing)Minimum Rainfall$(): 240$(br)$(thing)Maximum Rainfall$(): 470$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): -4°C$(br)$(thing)Max Temp for Production$(): 6°C$(br)$(thing)Spring Exclusive$(): Yes$(br)$(thing)Flow Rate$(): 5mb"
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): -8.4°C$(br)$(thing)Maximum Temperature$(): 8°C$(br)$(thing)Minimum Rainfall$(): 240$(br)$(thing)Maximum Rainfall$(): 470$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): -15°C$(br)$(thing)Max Temp for Production$(): 5°C$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 5mb"
},
{
"type": "patchouli:image",
@ -32,7 +32,7 @@
"title": "Birch",
"item": "tfc:wood/log/birch,tfc:wood/wood/birch,tfc:wood/leaves/birch,tfc:wood/sapling/birch",
"link_recipe": false,
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): -12.1°C$(br)$(thing)Maximum Temperature$(): 6.1°C$(br)$(thing)Minimum Rainfall$(): 125$(br)$(thing)Maximum Rainfall$(): 310$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): -4°C$(br)$(thing)Max Temp for Production$(): 6°C$(br)$(thing)Spring Exclusive$(): Yes$(br)$(thing)Flow Rate$(): 5mb"
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): -12.1°C$(br)$(thing)Maximum Temperature$(): 6.1°C$(br)$(thing)Minimum Rainfall$(): 125$(br)$(thing)Maximum Rainfall$(): 310$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): -15°C$(br)$(thing)Max Temp for Production$(): 5°C$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 5mb"
},
{
"type": "patchouli:image",

2
kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json
View file

@ -3769,7 +3769,7 @@
}
}
],
"text": "$(thing)Wild Flax$() grows between -5 and 27C, and 175 to 475mm of rainfall."
"text": "$(thing)Wild Flax$() grows between -5 and 23C, and 175 to 475mm of rainfall."
}
],
"read_by_default": true,

4
kubejs/data/tfg/worldgen/configured_feature/earth/flax_patch.json
View file

@ -33,8 +33,8 @@
}
]
},
"tries": 20,
"xz_spread": 16,
"tries": 5,
"xz_spread": 8,
"y_spread": 1
}
}

2
kubejs/data/tfg/worldgen/configured_feature/earth/rapeseed_patch.json
View file

@ -33,7 +33,7 @@
}
]
},
"tries": 16,
"tries": 12,
"xz_spread": 10,
"y_spread": 1
}

2
kubejs/data/tfg/worldgen/configured_feature/earth/sunflower_patch.json
View file

@ -34,7 +34,7 @@
]
},
"tries": 16,
"xz_spread": 10,
"xz_spread": 20,
"y_spread": 1
}
}

4
kubejs/data/tfg/worldgen/placed_feature/earth/flax_patch.json
View file

@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 55
"chance": 150
},
{
"type": "minecraft:in_square"
@ -11,7 +11,7 @@
{
"type": "tfc:climate",
"min_temperature": -5,
"max_temperature": 27,
"max_temperature": 23,
"min_rainfall": 175,
"max_rainfall": 475,
"max_forest": "sparse"

2
kubejs/data/tfg/worldgen/placed_feature/earth/rapeseed_patch.json
View file

@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 80
"chance": 100
},
{
"type": "minecraft:in_square"

2
kubejs/data/tfg/worldgen/placed_feature/earth/sunflower_patch.json
View file

@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 80
"chance": 100
},
{
"type": "minecraft:in_square"

20
kubejs/server_scripts/afc/recipes.js
View file

@ -188,6 +188,24 @@ const registerAFCRecipes = (event) => {
.requiresNaturalLog(true)
.id("tfg:tree_tapping/ancient_douglas_fir_resin")
//Syrups
event.remove({ id: "afc:tree_tapping/maple_syrup" })
event.remove({ id: "afc:tree_tapping/birch_syrup" })
event.recipes.afc.tree_tapping(TFC.blockIngredient('tfc:wood/log/maple'))
.resultFluid(Fluid.of('afc:maple_sap', 5))
.minTemp(-15)
.maxTemp(5)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/maple_log")
event.recipes.afc.tree_tapping(TFC.blockIngredient('tfc:wood/log/birch'))
.resultFluid(Fluid.of('afc:birch_sap', 5))
.minTemp(-15)
.maxTemp(5)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/birch_log")
// Mars stuff
event.recipes.afc.tree_tapping(TFC.blockIngredient('beneath:wood/log/crimson'))
@ -456,4 +474,4 @@ const registerAFCRecipes = (event) => {
processingTime: 50
}).id(`tfg:vi/lathe/stripping_${x.wood}_wood`)
})
}
}

6
kubejs/server_scripts/immersive_aircraft/tags.js
View file

@ -4,7 +4,7 @@
*
* @param {TagEvent.Item} evt
*/
const registerImmersiveAircraftItemTags = (evt) => {
evt.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:propeller');
evt.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:boiler')
const registerImmersiveAircraftItemTags = (event) => {
event.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:propeller')
event.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:boiler')
}

1
kubejs/server_scripts/main_server_script.js
View file

@ -36,6 +36,7 @@ ServerEvents.tags('item', event => {
registerGrapplemodItemTags(event)
registerGreateItemTags(event)
registerGTCEUItemTags(event)
registerImmersiveAircraftItemTags(event)
registerMegaCellsItemTags(event)
registerMinecraftItemTags(event)
registerModernMarkingsItemTags(event)

3
kubejs/server_scripts/vintage_improvements/recipes.js
View file

@ -77,9 +77,6 @@ function registerVintageImprovementsRecipes(event) {
F: '#forge:springs/wrought_iron'
}).addMaterialInfo().id('tfg:vi/shaped/curving_press')
event.shapeless('vintageimprovements:curving_press', ['create:mechanical_press', '#forge:tools/files'])
.id('tfg:shapeless/mech_press_converting')
event.shaped('vintageimprovements:helve_hammer', [
'F A',
'BBE',

1
pakku-lock.json
View file

@ -13819,6 +13819,7 @@
{
"pakku_id": "UUgCxePdwRd5MyWw",
"type": "MOD",
"side": "CLIENT",
"slug": {
"curseforge": "third-person-shooting"
},

3
pakku.json
View file

@ -244,6 +244,9 @@
"pick-up-notifier": {
"side": "CLIENT"
},
"third-person-shooting": {
"side": "CLIENT"
},
"inventory-tweaks-refoxed": {
"side": "BOTH"
},