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-12-20 18:26:26 +00:00
commit bb035f5798
5 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/InventoryHUD/curios.json
View file

@ -1,6 +1,6 @@
{
"clothes_hat": {
"x": 20,
"x": 30,
"y": 98,
"enabled": true,
"halign": "LEFT",
@ -63,7 +63,7 @@
"valign": "BOTTOM"
},
"clothes_torso": {
"x": 20,
"x": 30,
"y": 80,
"enabled": true,
"halign": "LEFT",
@ -98,14 +98,14 @@
"valign": "TOP"
},
"clothes_pants": {
"x": 20,
"x": 30,
"y": 62,
"enabled": true,
"halign": "LEFT",
"valign": "BOTTOM"
},
"clothes_socks": {
"x": 20,
"x": 30,
"y": 44,
"enabled": true,
"halign": "LEFT",

3
kubejs/assets/emi/index/stacks/hidden.json
View file

@ -1,5 +1,6 @@
{
"removed": [
"item:gtceu:sus_record"
"item:gtceu:sus_record",
"expatternprovider:fishbig"
]
}

13
kubejs/server_scripts/extended_ae2/recipes.js
View file

@ -869,6 +869,19 @@ const registerExtendedAE2Recipes = (event) => {
.EUt(GTValues.VA[GTValues.IV])
.dimension('ad_astra:moon')
event.recipes.shaped(
Item.of('expatternprovider:fishbig'),
[
'CCC',
'CFC',
'CCC'
],
{
C: '#tfc:sewing_light_cloth',
F: '#minecraft:fishes'
}
)
//#endregion
}

13
kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js
View file

@ -48,7 +48,18 @@ function registerTFGRockRecipes(event) {
{ loose: 'minecraft:popped_chorus_fruit', block: '4x minecraft:purpur_block' },
{ loose: 'gtceu:stone_ingot', block: '4x minecraft:stone_bricks' }
{ loose: 'gtceu:stone_ingot', block: '4x minecraft:stone_bricks' },
{ loose: 'minecraft:deepslate', block: '2x tfg:rock/hardened_deepslate' },
{ loose: 'minecraft:blackstone', block: '2x tfg:rock/hardened_blackstone' },
{ loose: 'minecraft:dripstone_block', block: '2x tfg:rock/hardened_dripstone' },
{ loose: 'ad_astra:moon_stone', block: '2x tfg:rock/hardened_moon_stone' },
{ loose: 'ad_astra:moon_deepslate', block: '2x tfg:rock/hardened_moon_deepslate'},
{ loose: 'ad_astra:mars_stone', block: '2x tfg:rock/hardened_mars_stone'},
{ loose: 'ad_astra:venus_stone', block: '2x tfg:rock/hardened_venus_stone'},
{ loose: 'ad_astra:mercury_stone', block: '2x tfg:rock/hardened_mercury_stone'},
{ loose: 'ad_astra:glacio_stone', block: '2x tfg:rock/hardened_glacio_stone'},
{ loose: 'gtceu:red_granite', block: '2x tfg:rock/hardened_red_granite'}
]
GLUEING_TOGETHER.forEach(x => {

3
kubejs/startup_scripts/gtceu/constants.js
View file

@ -246,7 +246,8 @@ global.GTCEU_HIDED_ITEMS = /** @type {const} */ ([
"gtceu:iv_damascus_steel_wrench",
"gtceu:lv_damascus_steel_screwdriver",
"gtceu:sus_record"
"gtceu:sus_record",
"expatternprovider:fishbig"
]);
//#endregion