fixed a bunch of the gregtech quests getting lost in a merge

This commit is contained in:
Pyritie 2025-05-07 22:12:31 +01:00
parent 415b8f6779
commit 22aa00116f

View file

@ -10,7 +10,7 @@
id: "1AD1F9822B738105"
linked_quest: "2E36E5755B2F551C"
x: 2.0d
y: 4.0d
y: 3.5d
}]
quests: [
{
@ -1116,7 +1116,7 @@
}
{
dependencies: [
"5F3063C539C9CBBF"
"1DF4DBE41BB0B6FD"
"4891E995D3EC2BD1"
]
description: ["{quests.tfg_tips.create_rubber_ingot.desc}"]
@ -2070,7 +2070,23 @@
subtitle: "{quests.tfg_tips.smoke_meat.subtitle}"
tasks: [
{
icon: "minecraft:beef"
icon: {
Count: 1
ForgeCaps: {
"tfc:food": {
creationDate: -9223372036854775808L
traits: [
"tfc:brined"
"firmalife:smoked"
]
}
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "tfc:food/beef"
}
id: "6F36FAA8AE1E2987"
item: {
Count: 1
@ -2305,7 +2321,10 @@
y: 9.5d
}
{
dependencies: ["2D959136A5FC5F46"]
dependencies: [
"2D959136A5FC5F46"
"56CA2EB7812529C5"
]
description: ["{quests.tfg_tips.lamps.desc}"]
id: "037CDA933FBE2CBE"
subtitle: "{quests.tfg_tips.lamps.subtitle}"
@ -2495,7 +2514,7 @@
]
title: "{quests.tfg_tips.charcoal_pile.title}"
x: -1.5d
y: 8.5d
y: 9.0d
}
{
dependencies: ["150B7C5CD152E1BA"]
@ -2679,7 +2698,7 @@
]
title: "{quests.tfg_tips.panning.title}"
x: 1.5d
y: 8.5d
y: 9.0d
}
{
dependencies: ["082310DF9BEA92CE"]
@ -2703,7 +2722,7 @@
}]
title: "{quests.tfg_tips.sluice.title}"
x: 1.5d
y: 10.0d
y: 10.5d
}
{
dependencies: ["60497014785301EB"]
@ -3125,8 +3144,8 @@
type: "item"
}]
title: "{quests.tfg_tips.camera.title}"
x: -8.5d
y: 5.0d
x: -9.5d
y: 5.5d
}
{
dependencies: ["275C8EA942AB49DD"]
@ -3146,8 +3165,8 @@
type: "item"
}]
title: "{quests.tfg_tips.film_rolls.title}"
x: -8.5d
y: 6.0d
x: -9.5d
y: 6.5d
}
{
dependencies: ["5D4EBB3347A69A42"]
@ -3177,8 +3196,8 @@
}
]
title: "{quests.tfg_tips.developing_film.title}"
x: -8.5d
y: 7.0d
x: -9.5d
y: 7.5d
}
{
dependencies: ["275C8EA942AB49DD"]
@ -3194,7 +3213,7 @@
type: "checkmark"
}]
title: "{quests.tfg_tips.selfie.title}"
x: -7.5d
x: -8.5d
y: 6.0d
}
{
@ -3208,8 +3227,8 @@
type: "item"
}]
title: "{quests.tfg_tips.photo.title}"
x: -8.5d
y: 8.0d
x: -9.5d
y: 8.5d
}
{
dependencies: ["3811F97636DBC518"]
@ -3222,8 +3241,8 @@
type: "item"
}]
title: "{quests.tfg_tips.photo_album.title}"
x: -9.0d
y: 9.0d
x: -10.0d
y: 9.5d
}
{
dependencies: ["3811F97636DBC518"]
@ -3236,8 +3255,8 @@
type: "item"
}]
title: "{quests.tfg_tips.photo_frame.title}"
x: -8.0d
y: 9.0d
x: -9.0d
y: 9.5d
}
{
dependencies: ["275C8EA942AB49DD"]
@ -3257,8 +3276,8 @@
type: "item"
}]
title: "{quests.tfg_tips.camera_attachments.title}"
x: -9.5d
y: 4.5d
x: -10.5d
y: 5.0d
}
{
dependencies: ["275C8EA942AB49DD"]
@ -3278,8 +3297,8 @@
type: "item"
}]
title: "{quests.tfg_tips.filters.title}"
x: -9.5d
y: 5.5d
x: -10.5d
y: 6.0d
}
{
dependencies: ["4E2C1CAD883EB032"]
@ -3298,8 +3317,8 @@
type: "item"
}]
title: "{quests.tfg_tips.interplanar_projector.title}"
x: -9.5d
y: 6.5d
x: -10.5d
y: 7.0d
}
{
dependencies: ["79FA776C414AE8E5"]
@ -3340,8 +3359,8 @@
type: "item"
}]
title: "{quests.tfg_tips.cane.title}"
x: 1.5d
y: 6.0d
x: -1.5d
y: 5.0d
}
{
dependencies: ["150B7C5CD152E1BA"]
@ -3590,7 +3609,7 @@
}]
title: "{quests.tfg_tips.pills.title}"
x: 4.0d
y: 7.0d
y: 8.0d
}
{
dependencies: ["28333A7852497C4D"]
@ -3611,7 +3630,7 @@
}]
title: "{quests.tfg_tips.tablets.title}"
x: 4.0d
y: 8.0d
y: 9.0d
}
{
dependencies: ["28333A7852497C4D"]
@ -3632,7 +3651,7 @@
}]
title: "{quests.tfg_tips.salvo.title}"
x: 4.0d
y: 9.0d
y: 10.0d
}
{
dependencies: ["128483FFDC8277A0"]
@ -4540,6 +4559,7 @@
y: 6.5d
}
{
dependencies: ["02FDECC931B5E8EF"]
description: [
"&3Long-Distance Item Pipes&r can be used to send items across great distances. Place one endpoint at each end, and connect them with pipeline blocks."
""
@ -4566,7 +4586,7 @@
}
]
title: "Long-Distance Items"
x: 5.5d
x: 4.0d
y: 2.0d
}
{
@ -4595,6 +4615,7 @@
y: 6.0d
}
{
dependencies: ["02FDECC931B5E8EF"]
description: [
"&3Long-Distance Fluid Pipes&r can be used to send fluids across great distances. Place one endpoint at each end, and connect them with pipeline blocks."
""
@ -4624,7 +4645,7 @@
}
]
title: "Long-Distance Pipeline"
x: 3.5d
x: 5.0d
y: 2.0d
}
{
@ -4655,8 +4676,8 @@
type: "item"
}]
title: "200IQ"
x: 9.0d
y: 3.0d
x: 12.0d
y: 4.5d
}
{
dependencies: ["74AE7DB845B88CF3"]
@ -4694,8 +4715,8 @@
}
]
title: "250IQ"
x: 9.0d
y: 4.0d
x: 12.0d
y: 5.5d
}
{
dependencies: ["02FDECC931B5E8EF"]
@ -4723,8 +4744,8 @@
type: "item"
}]
title: "GregTech Storage"
x: 6.5d
y: 3.0d
x: 6.0d
y: 2.0d
}
{
dependencies: ["6702D52922D85C0D"]
@ -4740,8 +4761,8 @@
type: "item"
}]
title: "Tape for Crate"
x: 6.5d
y: 2.0d
x: 6.0d
y: 3.0d
}
{
dependencies: ["02FDECC931B5E8EF"]
@ -4754,8 +4775,8 @@
title: "Filters"
type: "checkmark"
}]
x: 8.0d
y: 3.5d
x: 11.0d
y: 5.0d
}
{
dependencies: ["02FDECC931B5E8EF"]
@ -4770,6 +4791,7 @@
y: 6.0d
}
{
dependencies: ["2D2CB8104E40E808"]
description: ["The &6Nano Saber&r is a powerful weapon youll be able to unlock once you reach &5EV&r. Simply use &dShift + Right-Click&r to activate the &cbzzzzz mode&r."]
id: "7A4C6930EF68646E"
tasks: [{
@ -4777,10 +4799,11 @@
item: "gtceu:nano_saber"
type: "item"
}]
x: 10.0d
y: 4.5d
x: 12.0d
y: 7.0d
}
{
dependencies: ["2D2CB8104E40E808"]
description: ["The &6Item Magnet&r is exactly what you'd expect — a magnet that pulls nearby &6items&r straight to you. &aVery useful&r. What more could you ask for?"]
id: "49D2EFFFC15563F9"
tasks: [{
@ -4794,8 +4817,8 @@
}
type: "item"
}]
x: 10.0d
y: 6.5d
x: 12.0d
y: 9.0d
}
{
dependencies: ["02FDECC931B5E8EF"]
@ -4807,9 +4830,10 @@
type: "item"
}]
x: 2.0d
y: 3.0d
y: 4.5d
}
{
dependencies: ["57FE828BAA8F6276"]
description: ["The &6Face Mask&r will protect you from &cinhaling dangerous dust&r. Its quite &aeasy to craft&r and should prevent issues when working with &5arsenic&r."]
id: "361AC06D62D9BCCF"
tasks: [{
@ -4823,29 +4847,306 @@
}
type: "item"
}]
x: 7.0d
y: 8.0d
x: 11.0d
y: 11.5d
}
{
dependencies: ["47409DED94FCC2BC"]
description: ["{quests.tfg_tips.ev_upgrades.desc}"]
id: "20905B37111F2ED9"
subtitle: "{quests.tfg_tips.ev_upgrades.subtitle}"
dependencies: ["02FDECC931B5E8EF"]
description: ["When you try to &aparallelize your setup&r with more machines, it can be a &cbother&r to set all the &einputs&r and &eoutputs&r for each one. Yeah, we're thinking of you, &dSuper Chests&r and &dTanks&r.\\n\\nIf you ever find yourself needing this &blittle tool&r, &adon't hesitate to use it&r."]
id: "7D5E9CFBE5990DFF"
tasks: [{
id: "60C5CDB3EBB706E4"
id: "39E0696844506874"
item: "gtceu:machine_memory_card"
type: "item"
}]
x: 2.0d
y: 5.5d
}
{
dependencies: ["7516BF9C12015DF3"]
id: "103025F1C35CF578"
tasks: [{
id: "05DA89E5871EE93D"
item: {
Count: 1
id: "gtceu:nanomuscle_helmet"
tag: { }
}
type: "item"
}]
x: 6.5d
y: 10.5d
}
{
dependencies: ["7516BF9C12015DF3"]
id: "38FF003C9349C0F2"
tasks: [{
id: "78123F2C1E8B08F5"
item: "gtceu:nanomuscle_chestplate"
type: "item"
}]
x: 6.5d
y: 11.5d
}
{
dependencies: ["7516BF9C12015DF3"]
id: "4497F39E06A14406"
tasks: [{
id: "430BB68AD2F334C3"
item: "gtceu:nanomuscle_leggings"
type: "item"
}]
x: 6.5d
y: 12.5d
}
{
dependencies: ["7516BF9C12015DF3"]
id: "61E1244FF797F11F"
tasks: [{
id: "1C5E79A87E343C64"
item: "gtceu:nanomuscle_boots"
type: "item"
}]
x: 6.5d
y: 13.5d
}
{
dependencies: ["38FF003C9349C0F2"]
id: "4C37DAD7C66523CC"
tasks: [{
id: "05BCE3FC68B3C66E"
item: {
Count: 1
id: "gtceu:avanced_nanomuscle_chestplate"
tag: { }
}
type: "item"
}]
x: 5.5d
y: 11.5d
}
{
dependencies: ["7516BF9C12015DF3"]
id: "20565B5D56786A6E"
tasks: [{
id: "51DBD71B96BB2673"
item: {
Count: 1
id: "gtceu:quarktech_helmet"
tag: { }
}
type: "item"
}]
x: 8.5d
y: 10.5d
}
{
dependencies: ["7516BF9C12015DF3"]
id: "4D5B75F5270CCBD3"
tasks: [{
id: "6624FAF8B9BBD4CA"
item: "gtceu:quarktech_chestplate"
type: "item"
}]
x: 8.5d
y: 11.5d
}
{
dependencies: ["7516BF9C12015DF3"]
id: "31CE775295A1BBF1"
tasks: [{
id: "6EAB7217D35DDF42"
item: "gtceu:quarktech_leggings"
type: "item"
}]
x: 8.5d
y: 12.5d
}
{
dependencies: ["7516BF9C12015DF3"]
id: "2613FA0502BB5F12"
tasks: [{
id: "6A740FDB1D788187"
item: "gtceu:quarktech_boots"
type: "item"
}]
x: 8.5d
y: 13.5d
}
{
dependencies: ["4D5B75F5270CCBD3"]
id: "035B0FDD90E51C0C"
tasks: [{
id: "154A01EC8F888EDB"
item: {
Count: 1
id: "gtceu:advanced_quarktech_chestplate"
tag: { }
}
type: "item"
}]
x: 9.5d
y: 11.5d
}
{
dependencies: ["2D2CB8104E40E808"]
description: ["Most &5GregTech&r tools are crafted from a &6Tool Head&r. Try using &aEMI&r to explore what you can do with them — just remember two important things:\\n\\n- The &ehigher the Tool Head tier&r, the more &cpowerful&r the tool will be, and the &6larger the battery&r it will use.\\n- Not every tool supports every Tool Head tier. For example, the &6Chainsaw&r can only be crafted with a &7LV Tool Head&r."]
id: "2CA86664C6E0C888"
tasks: [{
id: "153D23778A26C74F"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfg:ev_aircraft_engine)item(tfg:titanium_plated_airplane_propeller)item(tfg:titanium_landing_gear)item(tfg:titanium_hull_reinforcement))"
"ftbfiltersystem:filter": "or(item(gtceu:lv_power_unit)item(gtceu:mv_power_unit)item(gtceu:hv_power_unit)item(gtceu:ev_power_unit)item(gtceu:iv_power_unit))"
}
}
title: "{quests.tfg_tips.ev_upgrades.task}"
type: "item"
}]
title: "{quests.tfg_tips.ev_upgrades.title}"
x: -6.0d
y: -14.0d
x: 12.0d
y: 8.0d
}
{
dependencies: ["02FDECC931B5E8EF"]
description: ["As with any good tech mod, &5GregTech&r comes with a wide variety of &6tools&r you can use. To operate them, you'll need to &acharge them with energy&r — and there are several ways to do that: place the tool in a &6Battery Buffer&r, in an &denergy slot&r of a machine, or even better, use a &eTurbo Charger&r.\\n\\nJust remember: you can only charge an item using a power source of &7equal&r or &ahigher tier&r. &cLower-tier sources&r wont work on higher-tier tools — but dont worry, &cnothing should explode&r. Probably."]
icon: {
Count: 1
id: "gtceu:iv_copper_drill"
tag: {
Charge: 2147483647L
DisallowContainerItem: 0b
GT.Behaviours: {
AoEColumn: 4
AoELayer: 8
AoERow: 4
MaxAoEColumn: 4
MaxAoELayer: 8
MaxAoERow: 4
TorchPlacing: 1b
}
GT.Tool: {
Damage: 0
HarvestLevel: 2
MaxDamage: 5543
ToolSpeed: 6.0f
}
HideFlags: 2
MaxCharge: 2147483647L
}
}
id: "2D2CB8104E40E808"
tasks: [
{
id: "5DA224C235E227E3"
title: "GT Tool"
type: "checkmark"
}
{
id: "5B0BF3A94CA0D8A9"
item: "gtceu:lv_charger_4x"
optional_task: true
type: "item"
}
]
x: 11.0d
y: 8.0d
}
{
dependencies: ["02FDECC931B5E8EF"]
description: ["With &5GregTech&r comes its own line of armor. Sure, it was cool to wear &7metal plates&r, but now that you're an &bindustrial maniac&r, maybe it's time to check out some &atechnological armor&r.\\n\\n&5GregTech&r provides two models. The first one becomes available around &6HV&r and offers better protection than anything you've worn before. It's equipped with &estrong insulation&r to withstand Earth's harsh climate, and it may even be upgraded with a &dJetpack&r.\\n\\nThe second model won't be available until much later — around &1IV&r and &dLuV&r. This one will allow you to &9breathe in space&r using &3oxygen&r."]
icon: "gtceu:advanced_integrated_circuit"
id: "7516BF9C12015DF3"
tasks: [{
id: "666B73CFDEA434F9"
title: "Armor"
type: "checkmark"
}]
x: 7.5d
y: 10.5d
}
{
dependencies: ["02FDECC931B5E8EF"]
description: ["With the new version of &5Gregtech&r, a &chazard system&r has been introduced. By holding &dShift&r while hovering over &cHazardous Materials&r, you can see how they might affect you.\\n\\nWe strongly advise using proper &6protective equipment&r to keep your &corgans intact&r."]
icon: "gtceu:generic_hazard_sign_block"
id: "57FE828BAA8F6276"
tasks: [{
id: "2BB4EAF68B305732"
title: "Hazard"
type: "checkmark"
}]
x: 11.0d
y: 10.5d
}
{
dependencies: ["57FE828BAA8F6276"]
description: ["The &6Gloves&r will obviously protect you from &cskin contact hazards&r. You have two ways to make them: a &7longer and more involved path&r through &2TerrafirmaCraft&r, or a much &aeasier method&r using the &6High Pressure Steam Alloy Smelter&r."]
id: "3DB4AD491EF28CBE"
tasks: [{
id: "32F0E30B11FE80E4"
item: {
Count: 1
id: "gtceu:rubber_gloves"
tag: {
Damage: 0
}
}
type: "item"
}]
x: 12.0d
y: 10.5d
}
{
dependencies: ["57FE828BAA8F6276"]
description: ["The &6Hazardous Materials Suit&r is the best way to protect yourself from &cany kind of harm&r. Youll be able to craft it once you reach &bMV&r, and &ayou should definitely take the time to do so&r."]
id: "784A0743B257EAEB"
tasks: [
{
id: "2FD004A7EDFCB2E0"
item: {
Count: 1
id: "gtceu:hazmat_headpiece"
tag: {
Damage: 0
}
}
type: "item"
}
{
id: "49B2D90D24684C1A"
item: {
Count: 1
id: "gtceu:hazmat_chestpiece"
tag: {
Damage: 0
}
}
type: "item"
}
{
id: "58446E22E13A04F0"
item: {
Count: 1
id: "gtceu:hazmat_leggings"
tag: {
Damage: 0
}
}
type: "item"
}
{
id: "36AF158E546D9EC8"
item: {
Count: 1
id: "gtceu:hazmat_boots"
tag: {
Damage: 0
}
}
type: "item"
}
]
x: 12.0d
y: 11.5d
}
]
subtitle: ["{quests.tfg_tips.subtitle}"]