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-01-27 00:21:57 +00:00
commit 3d2a5bc962
39 changed files with 1096 additions and 496 deletions
Download patch file Download diff file Expand all files Collapse all files

17
config/ftbquests/quests/chapters/create_logistics.snbt
View file

@ -131,6 +131,8 @@
dependencies: [
"572A8983FA12152A"
"3AF956758FA289A8"
"07E7678095258EDB"
"383A14A5C65B3ADF"
]
dependency_requirement: "one_completed"
description: ["{quests.create_logistics.rose_quartz_lens.desc}"]
@ -209,8 +211,9 @@
{
dependencies: [
"7C4807A247AF36A1"
"648BCF486E16CCB2"
"713C8D6A20BF3A0E"
]
dependency_requirement: "one_completed"
description: ["{quests.create_logistics.stock_link.desc}"]
id: "76490E046A44BCC3"
size: 2.0d
@ -225,7 +228,11 @@
y: -1.0d
}
{
dependencies: ["76490E046A44BCC3"]
dependencies: [
"76490E046A44BCC3"
"50FE830DA6F403B2"
]
dependency_requirement: "one_completed"
description: [
"{quests.create_logistics.stock_ticker.desc.1}"
"{@pagebreak}"
@ -245,7 +252,11 @@
y: -2.5d
}
{
dependencies: ["76490E046A44BCC3"]
dependencies: [
"76490E046A44BCC3"
"50FE830DA6F403B2"
]
dependency_requirement: "one_completed"
description: ["{quests.create_logistics.redstone_requester.desc}"]
id: "3F44CFF8A6018F3E"
subtitle: "{quests.create_logistics.redstone_requester.subtitle}"

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

@ -92,7 +92,6 @@
{
dependencies: [
"601088B7920140B2"
"3FBDC8552F7D8008"
"3B18DE7395776B41"
]
description: ["{quests.extreme_voltage.t2_rocket.desc}"]

8
config/ftbquests/quests/chapters/gregtech_energy.snbt
View file

@ -118,10 +118,7 @@
y: -7.0d
}
{
dependencies: [
"06B2E38F7DCF2678"
"22510C5F2386B453"
]
dependencies: ["06B2E38F7DCF2678"]
dependency_requirement: "one_completed"
description: ["{quests.gregtech_energy.produce_energy.desc}"]
icon: "gtceu:lv_field_generator"
@ -1083,12 +1080,15 @@
"4C620105AAC49381"
"0C718329245D9619"
]
description: ["{quests.low_voltage.lv_biodiesel.desc}"]
id: "139C7DF629329753"
subtitle: "{quests.low_voltage.lv_biodiesel.subtitle}"
tasks: [{
id: "7BA9FDD1F45B53F6"
item: "gtceu:bio_diesel_bucket"
type: "item"
}]
title: "{quests.low_voltage.lv_biodiesel.title}"
x: -9.0d
y: -7.0d
}

785
config/ftbquests/quests/chapters/lv__low_voltage.snbt
View file

File diff suppressed because it is too large Load diff

5
config/ftbquests/quests/chapters/questsmetallurgy.snbt
View file

@ -415,6 +415,7 @@
description: ["{quests.metal_age.anvil_recycling.desc}"]
icon: "tfc:firepit"
id: "3B2550394C94CEC9"
shape: "circle"
size: 1.0d
subtitle: "{quests.metal_age.anvil_recycling.subtitle}"
tasks: [{
@ -646,6 +647,7 @@
}
}
id: "5792DDAA82895E67"
shape: "circle"
subtitle: "{quests.metal_age.red_blu.subtitle}"
tasks: [{
id: "63890641DCD6659F"
@ -719,6 +721,7 @@
description: ["{quests.metal_age.wrought_iron_goodies.desc}"]
icon: "create:chute"
id: "20C2CE92459BE14A"
shape: "circle"
subtitle: "{quests.metal_age.wrought_iron_goodies.subtitle}"
tasks: [{
id: "60605AA92B6947D8"
@ -734,6 +737,7 @@
description: ["{quests.metal_age.fire_clay_ingredients.desc}"]
icon: "minecraft:cartography_table"
id: "5A936E9BCF30AA3D"
shape: "circle"
subtitle: "{quests.metal_age.fire_clay_ingredients.subtitle}"
tasks: [{
id: "39CA01175999A291"
@ -816,6 +820,7 @@
description: ["{quests.metal_age.steel_goodies.desc}"]
icon: "greate:steel_mechanical_pump"
id: "0C9B7745D812555A"
shape: "circle"
subtitle: "{quests.metal_age.steel_goodies.subtitle}"
tasks: [{
id: "3EB7C3AE88950E4B"

157
config/ftbquests/quests/chapters/questssteam_age.snbt
View file

@ -19,20 +19,22 @@
{
id: "39027CF4DC307D33"
linked_quest: "5E186CD5E83BFDF0"
x: -28.5d
x: -27.0d
y: 2.0d
}
{
id: "0CE64B9914191C56"
linked_quest: "6FFD4990FF07078A"
shape: "diamond"
x: -9.5d
x: -9.0d
y: 11.5d
}
{
id: "23A27702FF816291"
linked_quest: "6903C72A254A7B08"
x: -12.5d
shape: "octagon"
size: 2.0d
x: -11.5d
y: 8.0d
}
{
@ -40,27 +42,27 @@
linked_quest: "48A8E3210B2BAE1C"
shape: "octagon"
size: 2.0d
x: -28.5d
x: -27.0d
y: 0.0d
}
{
id: "7C03FE015586C652"
linked_quest: "55213ACBF5F5D398"
shape: "heart"
x: -12.0d
x: -10.5d
y: 16.0d
}
{
id: "65E0B13E245D2E5F"
linked_quest: "379F434116632A89"
x: -26.0d
x: -24.5d
y: 1.0d
}
{
id: "68F5E521F2DB0A86"
linked_quest: "0404FBCC34011053"
shape: "heart"
x: -13.0d
x: -11.5d
y: 16.0d
}
{
@ -77,6 +79,14 @@
x: -22.5d
y: 4.0d
}
{
id: "6C8C3BBD2BA9853B"
linked_quest: "56CA2EB7812529C5"
shape: "gear"
size: 1.5d
x: -13.0d
y: 13.5d
}
]
quests: [
{
@ -84,7 +94,11 @@
"7B045998769930F0"
"55FDF06AC0C01D0B"
]
description: ["{quests.steam_age.basic_millstone.desc}"]
description: [
"{quests.steam_age.basic_millstone.desc.1}"
"{@pagebreak}"
"{quests.steam_age.basic_millstone.desc.2}"
]
id: "48C1E980F7D64317"
size: 1.0d
subtitle: "{quests.steam_age.basic_millstone.subtitle}"
@ -94,7 +108,7 @@
type: "item"
}]
title: "{quests.steam_age.basic_millstone.title}"
x: -20.5d
x: -19.0d
y: 0.0d
}
{
@ -112,7 +126,7 @@
type: "item"
}]
title: "{quests.steam_age.horse_crank.title}"
x: -24.5d
x: -23.0d
y: -2.0d
}
{
@ -131,7 +145,7 @@
type: "item"
}]
title: "{quests.steam_age.helve_hammer.title}"
x: -20.5d
x: -19.0d
y: -4.0d
}
{
@ -159,7 +173,7 @@
}
]
title: "{quests.steam_age.basic_greate.title}"
x: -20.5d
x: -19.0d
y: -2.0d
}
{
@ -173,7 +187,7 @@
type: "item"
}]
title: "{quests.steam_age.water_wheel.title}"
x: -14.5d
x: -13.0d
y: 0.0d
}
{
@ -195,7 +209,7 @@
}
]
title: "{quests.steam_age.windmill.title}"
x: -14.5d
x: -13.0d
y: -4.0d
}
{
@ -210,7 +224,7 @@
type: "item"
}]
title: "{quests.steam_age.metal_casing.title}"
x: -9.5d
x: -8.0d
y: -2.0d
}
{
@ -227,7 +241,7 @@
type: "item"
}]
title: "{quests.steam_age.steel_encased_fan.title}"
x: -5.5d
x: -4.0d
y: 4.0d
}
{
@ -247,7 +261,7 @@
type: "item"
}]
title: "{quests.steam_age.steel_pump.title}"
x: -3.5d
x: -2.0d
y: 2.0d
}
{
@ -297,7 +311,7 @@
}
]
title: "{quests.steam_age.steam_engine.title}"
x: -5.5d
x: -4.0d
y: -2.0d
}
{
@ -316,7 +330,7 @@
type: "item"
}]
title: "{quests.steam_age.mechanical_saw.title}"
x: -9.5d
x: -8.0d
y: 0.0d
}
{
@ -330,7 +344,7 @@
type: "item"
}]
title: "{quests.steam_age.mechanical_harvester.title}"
x: -9.5d
x: -8.0d
y: -4.0d
}
{
@ -358,7 +372,7 @@
}
]
title: "{quests.steam_age.chute.title}"
x: -12.0d
x: -10.5d
y: 0.0d
}
{
@ -376,7 +390,7 @@
type: "item"
}]
title: "{quests.steam_age.mold_table.title}"
x: -3.5d
x: -2.0d
y: 4.0d
}
{
@ -406,7 +420,7 @@
}
]
title: "{quests.steam_age.steel_greate.title}"
x: -5.5d
x: -4.0d
y: 2.0d
}
{
@ -424,7 +438,7 @@
type: "item"
}]
title: "{quests.steam_age.steel_millstone.title}"
x: -7.5d
x: -6.0d
y: 2.0d
}
{
@ -523,8 +537,8 @@
}
]
title: "{quests.steam_age.miner.title}"
x: -10.0d
y: 17.0d
x: -9.0d
y: 18.0d
}
{
dependencies: [
@ -681,7 +695,7 @@
type: "item"
}]
title: "{quests.steam_age.item_pipes.title}"
x: -12.0d
x: -10.5d
y: 2.0d
}
{
@ -708,7 +722,7 @@
}
]
title: "{quests.steam_age.circuit_boards.title}"
x: -10.0d
x: -9.0d
y: 10.0d
}
{
@ -777,8 +791,8 @@
type: "item"
}]
title: "{quests.steam_age.vacuum_tubes.title}"
x: -8.0d
y: 14.0d
x: -7.0d
y: 15.0d
}
{
dependencies: ["7DB7AB5349218605"]
@ -828,7 +842,7 @@
type: "item"
}]
title: "{quests.steam_age.resistors.title}"
x: -5.0d
x: -4.0d
y: 11.5d
}
{
@ -844,8 +858,8 @@
type: "item"
}]
title: "{quests.steam_age.coiling_machine.title}"
x: -5.0d
y: 16.0d
x: -4.0d
y: 17.0d
}
{
dependencies: ["2C35D4E01AEC02AA"]
@ -860,8 +874,8 @@
type: "item"
}]
title: "{quests.steam_age.steel_mixer.title}"
x: -5.0d
y: 14.5d
x: -4.0d
y: 15.5d
}
{
dependencies: ["2C35D4E01AEC02AA"]
@ -875,8 +889,8 @@
type: "item"
}]
title: "{quests.steam_age.lathe.title}"
x: -6.0d
y: 17.0d
x: -5.0d
y: 18.0d
}
{
dependencies: [
@ -913,8 +927,8 @@
type: "item"
}]
title: "{quests.steam_age.vibrating_table.title}"
x: -8.0d
y: 17.0d
x: -7.0d
y: 18.0d
}
{
dependencies: ["2C35D4E01AEC02AA"]
@ -933,8 +947,8 @@
type: "item"
}]
title: "{quests.steam_age.rolling_mill.title}"
x: -5.0d
y: 13.0d
x: -4.0d
y: 14.0d
}
{
dependencies: ["2C35D4E01AEC02AA"]
@ -948,8 +962,8 @@
type: "item"
}]
title: "{quests.steam_age.steel_saw.title}"
x: -7.0d
y: 17.0d
x: -6.0d
y: 18.0d
}
{
dependencies: ["2C35D4E01AEC02AA"]
@ -963,8 +977,8 @@
type: "item"
}]
title: "{quests.steam_age.curving_press.title}"
x: -9.0d
y: 17.0d
x: -8.0d
y: 18.0d
}
{
dependencies: [
@ -1124,7 +1138,7 @@
}
]
title: "{quests.steam_age.fluid_pipes.title}"
x: -3.5d
x: -2.0d
y: 0.0d
}
{
@ -1150,7 +1164,7 @@
type: "item"
}]
title: "{quests.steam_age.fluid_drums.title}"
x: -1.5d
x: 0.0d
y: 2.0d
}
{
@ -1179,8 +1193,8 @@
type: "item"
}]
title: "{quests.steam_age.potin.title}"
x: -3.5d
y: 14.5d
x: -2.5d
y: 15.5d
}
{
dependencies: ["6F1BC99BE641B671"]
@ -1207,7 +1221,7 @@
}
]
title: "{quests.steam_age.create_tools.title}"
x: -22.5d
x: -21.0d
y: -4.0d
}
{
@ -1240,7 +1254,10 @@
y: 16.0d
}
{
dependencies: ["6AA07588374B59AB"]
dependencies: [
"6AA07588374B59AB"
"56CA2EB7812529C5"
]
description: ["{quests.steam_age.vacuum_chamber.desc}"]
id: "5F3063C539C9CBBF"
subtitle: "{quests.steam_age.vacuum_chamber.subtitle}"
@ -1250,7 +1267,7 @@
type: "item"
}]
title: "{quests.steam_age.vacuum_chamber.title}"
x: -12.5d
x: -11.5d
y: 15.0d
}
{
@ -1321,7 +1338,7 @@
}
]
title: "{quests.steam_age.poor_paths.title}"
x: -26.0d
x: -24.5d
y: -3.5d
}
{
@ -1373,7 +1390,7 @@
}
]
title: "{quests.steam_age.normal_paths.title}"
x: -26.5d
x: -25.0d
y: -2.0d
}
{
@ -1431,7 +1448,7 @@
}
]
title: "{quests.steam_age.good_paths.title}"
x: -26.0d
x: -24.5d
y: -0.5d
}
{
@ -1453,7 +1470,7 @@
type: "item"
}]
title: "{quests.steam_age.lv_circuit.title}"
x: -8.0d
x: -7.0d
y: 8.0d
}
{
@ -1468,7 +1485,7 @@
type: "item"
}]
title: "{quests.steam_age.paper.title}"
x: -3.5d
x: -2.5d
y: 11.5d
}
{
@ -1491,7 +1508,7 @@
type: "item"
}]
title: "{quests.metal_age.bronze_goodies.title}"
x: -22.5d
x: -21.0d
y: -2.0d
}
{
@ -1515,7 +1532,7 @@
type: "item"
}]
title: "{quests.metal_age.wrought_iron_goodies.title}"
x: -12.0d
x: -10.5d
y: -2.0d
}
{
@ -1539,7 +1556,7 @@
type: "item"
}]
title: "{quests.metal_age.steel_goodies.title}"
x: -5.5d
x: -4.0d
y: 0.0d
}
{
@ -1621,7 +1638,7 @@
type: "item"
}]
title: "{quests.steam_age.rotation_speed_controller.title}"
x: -7.5d
x: -6.0d
y: 0.0d
}
{
@ -1638,7 +1655,7 @@
type: "item"
}]
title: "{quests.steam_age.resin_boards.title}"
x: -11.5d
x: -10.5d
y: 11.5d
}
{
@ -1672,7 +1689,7 @@
}
]
title: "{quests.metal_age.coke_oven.title}"
x: -14.5d
x: -13.0d
y: -2.0d
}
{
@ -1707,7 +1724,7 @@
type: "item"
}]
title: "{quests.steam_age.basic_mech_press.title}"
x: -18.5d
x: -17.0d
y: -2.0d
}
{
@ -1730,7 +1747,7 @@
type: "item"
}]
title: "{quests.steam_age.steel_mech_press.title}"
x: -7.5d
x: -6.0d
y: 4.0d
}
{
@ -1745,7 +1762,7 @@
type: "checkmark"
}]
title: "{quests.steam_age.fuel_sources.title}"
x: -7.5d
x: -6.0d
y: -2.0d
}
{
@ -1759,7 +1776,7 @@
type: "item"
}]
title: "{quests.steam_age.large_water_wheel.title}"
x: -3.5d
x: -2.0d
y: -2.0d
}
{
@ -1781,8 +1798,8 @@
type: "item"
}]
title: "{quests.steam_age.supers.title}"
x: -10.5d
y: 13.5d
x: -6.0d
y: 13.0d
}
{
dependencies: ["0D0D461AE3A3F7BF"]
@ -1811,7 +1828,7 @@
}
]
title: "{quests.steam_age.multiblock_tank.title}"
x: -16.5d
x: -15.0d
y: -2.0d
}
{

2
config/ftbquests/quests/chapters/questsstoneage.snbt
View file

@ -1674,6 +1674,7 @@
}
}
id: "1562419608EB333D"
shape: "circle"
size: 1.5d
subtitle: "{quests.stone_age.hydration.subtitle}"
tasks: [{
@ -1847,6 +1848,7 @@
description: ["{quests.stone_age.water_bucket.desc}"]
icon: "minecraft:water_bucket"
id: "1F9321F1743A0B79"
shape: "circle"
subtitle: "{quests.stone_age.water_bucket.subtitle}"
tasks: [{
id: "64BE95016DF461FD"

24
config/ftbquests/quests/chapters/tips__tools.snbt
View file

@ -790,7 +790,10 @@
y: 15.0d
}
{
dependencies: ["02FDECC931B5E8EF"]
dependencies: [
"02FDECC931B5E8EF"
"3E6DC423FE4A99F7"
]
description: [
"{quests.tfg_tips.gt_power_tools.desc.1}"
"{@pagebreak}"
@ -823,20 +826,13 @@
}
}
id: "2D2CB8104E40E808"
optional: true
subtitle: "{quests.tfg_tips.gt_power_tools.subtitle}"
tasks: [
{
id: "5DA224C235E227E3"
title: "GT Tool"
type: "checkmark"
}
{
id: "5B0BF3A94CA0D8A9"
item: "gtceu:lv_charger_4x"
optional_task: true
type: "item"
}
]
tasks: [{
id: "5DA224C235E227E3"
title: "GT Tool"
type: "checkmark"
}]
title: "{quests.tfg_tips.gt_power_tools.title}"
x: 10.5d
y: 11.5d