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-04 00:29:11 +00:00
commit bd4aee52c4
21 changed files with 405 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
View file

@ -2338,13 +2338,28 @@
{
dependencies: ["617CF3335584DC8D"]
description: ["{quests.extreme_voltage.heat_battery.desc}"]
icon: "tfg:heat_battery_mk1"
id: "26AA29016BA23396"
subtitle: "{quests.extreme_voltage.heat_battery.subtitle}"
tasks: [{
id: "5C9A37E905A4030F"
item: "tfg:heat_battery_mk1"
type: "item"
}]
tasks: [
{
id: "5C9A37E905A4030F"
item: "tfg:heat_battery_mk1"
type: "item"
}
{
id: "7B355A4ECACCBE5C"
item: "tfg:copper_sandy_frame"
optional_task: true
type: "item"
}
{
id: "36B68338FCD5F7F5"
item: "tfg:beryllium_sandy_frame"
optional_task: true
type: "item"
}
]
x: 22.0d
y: 4.5d
}

28
kubejs/assets/gtceu/blockstates/ev_1024a_laser_source_hatch.json Normal file
View file

@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "gtceu:block/machine/ev_1024a_laser_source_hatch",
"x": 90
},
"facing=east": {
"model": "gtceu:block/machine/ev_1024a_laser_source_hatch",
"y": 90
},
"facing=north": {
"model": "gtceu:block/machine/ev_1024a_laser_source_hatch"
},
"facing=south": {
"model": "gtceu:block/machine/ev_1024a_laser_source_hatch",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "gtceu:block/machine/ev_1024a_laser_source_hatch",
"x": 270
},
"facing=west": {
"model": "gtceu:block/machine/ev_1024a_laser_source_hatch",
"y": 270
}
}
}

28
kubejs/assets/gtceu/blockstates/ev_1024a_laser_target_hatch.json Normal file
View file

@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "gtceu:block/machine/ev_1024a_laser_target_hatch",
"x": 90
},
"facing=east": {
"model": "gtceu:block/machine/ev_1024a_laser_target_hatch",
"y": 90
},
"facing=north": {
"model": "gtceu:block/machine/ev_1024a_laser_target_hatch"
},
"facing=south": {
"model": "gtceu:block/machine/ev_1024a_laser_target_hatch",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "gtceu:block/machine/ev_1024a_laser_target_hatch",
"x": 270
},
"facing=west": {
"model": "gtceu:block/machine/ev_1024a_laser_target_hatch",
"y": 270
}
}
}

28
kubejs/assets/gtceu/blockstates/ev_256a_laser_source_hatch.json Normal file
View file

@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "gtceu:block/machine/ev_256a_laser_source_hatch",
"x": 90
},
"facing=east": {
"model": "gtceu:block/machine/ev_256a_laser_source_hatch",
"y": 90
},
"facing=north": {
"model": "gtceu:block/machine/ev_256a_laser_source_hatch"
},
"facing=south": {
"model": "gtceu:block/machine/ev_256a_laser_source_hatch",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "gtceu:block/machine/ev_256a_laser_source_hatch",
"x": 270
},
"facing=west": {
"model": "gtceu:block/machine/ev_256a_laser_source_hatch",
"y": 270
}
}
}

28
kubejs/assets/gtceu/blockstates/ev_256a_laser_target_hatch.json Normal file
View file

@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "gtceu:block/machine/ev_256a_laser_target_hatch",
"x": 90
},
"facing=east": {
"model": "gtceu:block/machine/ev_256a_laser_target_hatch",
"y": 90
},
"facing=north": {
"model": "gtceu:block/machine/ev_256a_laser_target_hatch"
},
"facing=south": {
"model": "gtceu:block/machine/ev_256a_laser_target_hatch",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "gtceu:block/machine/ev_256a_laser_target_hatch",
"x": 270
},
"facing=west": {
"model": "gtceu:block/machine/ev_256a_laser_target_hatch",
"y": 270
}
}
}

28
kubejs/assets/gtceu/blockstates/ev_4096a_laser_source_hatch.json Normal file
View file

@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "gtceu:block/machine/ev_4096a_laser_source_hatch",
"x": 90
},
"facing=east": {
"model": "gtceu:block/machine/ev_4096a_laser_source_hatch",
"y": 90
},
"facing=north": {
"model": "gtceu:block/machine/ev_4096a_laser_source_hatch"
},
"facing=south": {
"model": "gtceu:block/machine/ev_4096a_laser_source_hatch",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "gtceu:block/machine/ev_4096a_laser_source_hatch",
"x": 270
},
"facing=west": {
"model": "gtceu:block/machine/ev_4096a_laser_source_hatch",
"y": 270
}
}
}

28
kubejs/assets/gtceu/blockstates/ev_4096a_laser_target_hatch.json Normal file
View file

@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "gtceu:block/machine/ev_4096a_laser_target_hatch",
"x": 90
},
"facing=east": {
"model": "gtceu:block/machine/ev_4096a_laser_target_hatch",
"y": 90
},
"facing=north": {
"model": "gtceu:block/machine/ev_4096a_laser_target_hatch"
},
"facing=south": {
"model": "gtceu:block/machine/ev_4096a_laser_target_hatch",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "gtceu:block/machine/ev_4096a_laser_target_hatch",
"x": 270
},
"facing=west": {
"model": "gtceu:block/machine/ev_4096a_laser_target_hatch",
"y": 270
}
}
}

32
kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_source_hatch.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:ev_1024a_laser_source_hatch",
"replaceable_textures": [
"bottom",
"top",
"side"
],
"variants": {
"is_formed=false": {
"model": {
"parent": "gtceu:block/machine/part/laser_source_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
},
"is_formed=true": {
"model": {
"parent": "gtceu:block/machine/part/laser_source_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
}
}
}

32
kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_target_hatch.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:ev_1024a_laser_target_hatch",
"replaceable_textures": [
"bottom",
"top",
"side"
],
"variants": {
"is_formed=false": {
"model": {
"parent": "gtceu:block/machine/part/laser_target_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
},
"is_formed=true": {
"model": {
"parent": "gtceu:block/machine/part/laser_target_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
}
}
}

32
kubejs/assets/gtceu/models/block/machine/ev_256a_laser_source_hatch.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:ev_256a_laser_source_hatch",
"replaceable_textures": [
"bottom",
"top",
"side"
],
"variants": {
"is_formed=false": {
"model": {
"parent": "gtceu:block/machine/part/laser_source_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
},
"is_formed=true": {
"model": {
"parent": "gtceu:block/machine/part/laser_source_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
}
}
}

32
kubejs/assets/gtceu/models/block/machine/ev_256a_laser_target_hatch.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:ev_256a_laser_target_hatch",
"replaceable_textures": [
"bottom",
"top",
"side"
],
"variants": {
"is_formed=false": {
"model": {
"parent": "gtceu:block/machine/part/laser_target_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
},
"is_formed=true": {
"model": {
"parent": "gtceu:block/machine/part/laser_target_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
}
}
}

32
kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_source_hatch.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:ev_4096a_laser_source_hatch",
"replaceable_textures": [
"bottom",
"top",
"side"
],
"variants": {
"is_formed=false": {
"model": {
"parent": "gtceu:block/machine/part/laser_source_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
},
"is_formed=true": {
"model": {
"parent": "gtceu:block/machine/part/laser_source_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
}
}
}

32
kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_target_hatch.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:ev_4096a_laser_target_hatch",
"replaceable_textures": [
"bottom",
"top",
"side"
],
"variants": {
"is_formed=false": {
"model": {
"parent": "gtceu:block/machine/part/laser_target_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
},
"is_formed=true": {
"model": {
"parent": "gtceu:block/machine/part/laser_target_hatch",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
}
}
}

3
kubejs/assets/gtceu/models/item/ev_1024a_laser_source_hatch.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/ev_1024a_laser_source_hatch"
}

3
kubejs/assets/gtceu/models/item/ev_1024a_laser_target_hatch.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/ev_1024a_laser_target_hatch"
}

3
kubejs/assets/gtceu/models/item/ev_256a_laser_source_hatch.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/ev_256a_laser_source_hatch"
}

3
kubejs/assets/gtceu/models/item/ev_256a_laser_target_hatch.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/ev_256a_laser_target_hatch"
}

3
kubejs/assets/gtceu/models/item/ev_4096a_laser_source_hatch.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/ev_4096a_laser_source_hatch"
}

3
kubejs/assets/gtceu/models/item/ev_4096a_laser_target_hatch.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/ev_4096a_laser_target_hatch"
}

6
kubejs/server_scripts/tfc/recipes.js
View file

@ -241,6 +241,12 @@ const registerTFCRecipes = (event) => {
.outputFluid(Fluid.of('tfc:vinegar', 250))
.id('tfc:barrel/vinegar')
// Clay dust to balls
event.recipes.tfc.barrel_sealed(8000)
.inputs('gtceu:clay_dust',TFC.fluidStackIngredient('minecraft:water', 250))
.outputItem('1x minecraft:clay_ball')
.id('tfc:barrel/clay_ball')
// Borax to flux
event.recipes.tfc.quern('4x tfc:powder/flux', 'gtceu:borax_dust')
.id(`tfg:quern/borax`)

2
kubejs/server_scripts/tfg/machines/recipes.casings.js
View file

@ -200,7 +200,7 @@ function registerTFGCasingRecipes(event) {
.itemInputs('gtceu:ostrum_frame', '4x #forge:plates/titanium_tungsten_carbide', '16x #forge:fine_wires/copper',
'16x #forge:fine_wires/tungsten_bismuth_oxide_composite')
.inputFluids(Fluid.of('gtceu:reinforced_epoxy_resin', 288))
.itemOutputs('2x tfg:machine_casing_power_casing')
.itemOutputs('4x tfg:machine_casing_power_casing')
.circuit(6)
.duration(2.5 * 20)
.EUt(GTValues.VA[GTValues.EV])