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-08-11 20:58:20 +01:00
commit 35a84dde36
13 changed files with 577 additions and 554 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kubejs/assets/tfg/lang/en_us.json
View file

@ -736,6 +736,11 @@
"tfg.tooltip.moon_rabbit_variant.cyan": "Seafoam Fur",
"tfg.tooltip.moon_rabbit_variant.purple": "Lavender Fur",
"tfg.tooltip.moon_rabbit_variant.sofu": "Sundae Fur",
"tfg.toast.ore_prospector_none": "No ores found in range.",
"tfg.toast.ore_prospector_message": "Ores found within %s §6blocks in this direction: %s",
"tooltip.tfg.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.",
"tooltip.tfg.ore_prospector_count": "This prospector will display ore counts.",
"tooltip.tfg.ore_prospector_xray": "This prospector will display an x-ray view of ore blocks.",
"item.treetap.tap": "Deprecated Item, Craft to Upgrade",
"item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade",
"item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade",

5
kubejs/assets/tfg/particles/ore_prospector.json Normal file
View file

@ -0,0 +1,5 @@
{
"textures": [
"tfg:ore_prospector_particle"
]
}

BIN
kubejs/assets/tfg/textures/particle/ore_prospector_particle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 215 B

2
kubejs/data/tfg/dimension_type/moon.json
View file

@ -10,7 +10,7 @@
"infiniburn": "#minecraft:infiniburn_overworld",
"logical_height": 384,
"min_y": 0,
"monster_spawn_block_light_limit": 15,
"monster_spawn_block_light_limit": 0,
"monster_spawn_light_level": {
"type": "minecraft:uniform",
"value": {

12
kubejs/server_scripts/tfg/tags.js
View file

@ -48,6 +48,18 @@ const registerTFGItemTags = (event) => {
event.add('tfg:harvester', 'tfg:harvest_basket')
event.add('tfg:harvester', 'tfg:aluminium_harvest_basket')
event.removeAll('tfc:propicks')
event.add('tfg:tools/ore_prospectors/copper', 'tfc:metal/propick/copper')
event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bronze')
event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bismuth_bronze')
event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/black_bronze')
event.add('tfg:tools/ore_prospectors/wrought_iron', 'tfc:metal/propick/wrought_iron')
event.add('tfg:tools/ore_prospectors/steel', 'tfc:metal/propick/steel')
event.add('tfg:tools/ore_prospectors/black_steel', 'tfc:metal/propick/black_steel')
event.add('tfg:tools/ore_prospectors/blue_steel', 'tfc:metal/propick/blue_steel')
event.add('tfg:tools/ore_prospectors/red_steel', 'tfc:metal/propick/red_steel')
//#endregion
// #region Paper from wood