Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space

This commit is contained in:
Pyritie 2025-05-13 17:10:27 +01:00
commit d226fd6954
6 changed files with 599 additions and 473 deletions

View file

@ -6,24 +6,14 @@
icon: "ae2:controller"
id: "09BE9F51822EC180"
order_index: 2
quest_links: [
{
id: "3293CB774C1A4DF0"
linked_quest: "1D88369409736DC7"
shape: "gear"
size: 2.0d
x: -7.0d
y: 0.0d
}
{
id: "6F0C443B72699EFA"
linked_quest: "05ABC370D7153350"
shape: "gear"
size: 2.0d
x: -4.0d
y: -2.0d
}
]
quest_links: [{
id: "6F0C443B72699EFA"
linked_quest: "05ABC370D7153350"
shape: "gear"
size: 2.0d
x: -4.0d
y: -2.0d
}]
quests: [
{
dependencies: ["15B4CB2A3B01C930"]
@ -253,8 +243,8 @@
}
{
dependencies: [
"1D88369409736DC7"
"3E51DAA2E5CF0422"
"27E6D3B21555EEC0"
]
id: "20AAF0C5177EC3FE"
size: 1.0d
@ -1914,20 +1904,22 @@
y: 2.0d
}
{
dependencies: ["1D88369409736DC7"]
dependencies: ["00A2566109144D7F"]
description: ["With your first step on the Moon comes access to your first &bCertus Quartz&r vein.\\nDon't worry — they're quite common and should be easy to locate, though having a decent &9Ore Scanner&r wouldnt hurt.\\n\\nWhether you decide to set up a miner or manually dig out a full vein, make sure to gather a &dhefty amount&r — youll need it to progress through &bAE2&r."]
id: "3E51DAA2E5CF0422"
subtitle: "A first step for you, a big leap for AE2"
tasks: [{
id: "65E083074C5E0111"
id: "201DEABD6D380F46"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:ores/certus_quartz)"
"ftbfiltersystem:filter": "or(item(gtceu:poor_raw_certus_quartz)item(gtceu:raw_certus_quartz)item(gtceu:rich_raw_certus_quartz))"
}
}
title: "Any #forge:ores/certus_quartz"
type: "item"
}]
title: "Certus Quartz"
x: -7.0d
y: 2.0d
}
@ -2373,6 +2365,19 @@
x: 2.0d
y: 3.0d
}
{
dependencies: ["52AD30F04DD5A812"]
id: "27E6D3B21555EEC0"
shape: "gear"
size: 2.0d
tasks: [{
id: "5490D2074B0AC944"
item: "gtceu:hv_polarizer"
type: "item"
}]
x: -7.0d
y: 0.0d
}
]
subtitle: ["{quests.ae2.subtitle}"]
title: "{quests.ae2}"

View file

@ -520,6 +520,7 @@
"478B0D55369C0F7F"
"6B08799BCFD01D3D"
"30A6EDDF25A5E5F8"
"173A04F328414A36"
]
description: [
"&aRuthenium-tungsten-molybdenum (RTM) Alloy Coils&r raise the Heat Capacity to a scorching &d4,500K&r."
@ -541,10 +542,7 @@
y: 2.25d
}
{
dependencies: [
"2D01E80DE837F6A6"
"7FA0ACB7F161F378"
]
dependencies: ["7FA0ACB7F161F378"]
description: [
"The &3Diode&r (the block, not the component) accepts energy inputs from 5 sides, but only outputs through a single side."
""
@ -1601,6 +1599,16 @@
x: 7.875d
y: 6.75d
}
{
id: "173A04F328414A36"
tasks: [{
id: "66828E992294F8BD"
item: "gtceu:rtm_alloy_ingot"
type: "item"
}]
x: 11.5d
y: 3.5d
}
]
subtitle: ["Improve your infrastructure and parallelise your setups"]
title: "&5EV&r - Extreme Voltage"

View file

@ -10,14 +10,17 @@
quest_links: [ ]
quests: [
{
description: ["We know that &5GregTech&r isnt the easiest mod to get into — especially when it comes to the &cenergy system&r. Thats why well take our time in this chapter to explain as much as we can.\\n\\nSome things here might not make full sense until later in your progression, so &adont stress yourself&r. Just try to understand what you can for now, and feel free to &dcome back to this chapter&r whenever you have questions.\\n\\nWeve split this chapter into &efour categories&r, each one covering a topic related to the &6GregTech Energy System&r. Well provide as many examples as possible to help you understand how it all works."]
description: ["{quests.gregtech_energy.start.desc}"]
icon: "gtceu:uhv_ultimate_battery"
id: "06B2E38F7DCF2678"
tasks: [{
id: "07E1FA6A1BB796D4"
title: "How to Gregtech"
type: "checkmark"
dimension: "minecraft:overworld"
icon: "gtceu:gregification_hazard_sign_block"
id: "7F62C4A9ED2562BD"
title: "{quests.gregtech_energy.start.task}"
type: "dimension"
}]
title: "{quests.gregtech_energy.start.title}"
x: 0.0d
y: 0.0d
}

File diff suppressed because it is too large Load diff

View file

@ -680,10 +680,7 @@
y: 14.0d
}
{
dependencies: [
"38DE506FF5B32031"
"3DFFA8F91452C62A"
]
dependencies: ["38DE506FF5B32031"]
description: ["{quests.medium_voltage.mv_second_hv.desc}"]
icon: "gtceu:micro_processor_assembly"
id: "5063FDFFBE3E4855"
@ -1007,7 +1004,7 @@
type: "item"
}]
title: "{quests.medium_voltage.mv_oilsands.title}"
x: -8.0d
x: -2.5d
y: 1.0d
}
{
@ -1016,7 +1013,6 @@
"6EB68C28BEE24DEF"
"05ADBAE5B6F38956"
]
dependency_requirement: "one_completed"
description: [
"{quests.medium_voltage.mv_distillery.desc.1}"
"{@pagebreak}"
@ -1031,12 +1027,12 @@
size: 1.0d
subtitle: "{quests.medium_voltage.mv_distillery.subtitle}"
tasks: [{
id: "6C32C7BCF9D12EBC"
id: "685043442271A0D0"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:lv_distillery)item(gtceu:mv_distillery))"
"ftbfiltersystem:filter": "or(item(gtceu:mv_distillery)item(gtceu:lv_distillery))"
}
}
title: "{quests.medium_voltage.mv_distillery.task}"
@ -1174,7 +1170,7 @@
}]
title: "{quests.medium_voltage.mv_mutli_channel.title}"
x: -8.0d
y: -2.0d
y: 1.0d
}
{
dependencies: ["315169840E06110F"]
@ -1488,11 +1484,11 @@
}
{
dependencies: ["22E462070F8B027A"]
description: ["{quests.medium_voltage.mv_.desc}"]
description: ["{quests.medium_voltage.mv_chemical_reactor.desc}"]
id: "79E8DC4D9B5F6B97"
shape: "octagon"
size: 2.0d
subtitle: "{quests.medium_voltage.mv_.subtitle}"
subtitle: "{quests.medium_voltage.mv_chemical_reactor.subtitle}"
tasks: [{
id: "04A6D4858DA3CE94"
item: "gtceu:mv_chemical_reactor"
@ -1519,6 +1515,54 @@
x: 9.0d
y: 6.0d
}
{
dependencies: [
"26394C1290D70AB6"
"5063FDFFBE3E4855"
]
dependency_requirement: "one_completed"
description: ["{quests.medium_voltage.lsb.desc}"]
icon: "gtceu:steel_large_boiler"
id: "730D7C10DEED3117"
shape: "square"
size: 1.0d
subtitle: "{quests.medium_voltage.lsb.subtitle}"
tasks: [{
id: "67728209D0BE18B1"
item: "gtceu:steel_large_boiler"
type: "item"
}]
title: "{quests.medium_voltage.lsb.desc}"
x: 1.28d
y: 16.5d
}
{
dependencies: ["315169840E06110F"]
description: ["{quests.medium_voltage.mv_cpu.desc}"]
icon: "gtceu:cpu_chip"
id: "2C875707A396B6D3"
subtitle: "{quests.medium_voltage.mv_cpu.subtitle}"
tasks: [
{
id: "0C0649DBFF188F15"
item: "gtceu:diamond_lens"
type: "item"
}
{
id: "54424809334833A8"
item: "gtceu:cpu_wafer"
type: "item"
}
{
id: "79DC85B4ACC166FB"
item: "gtceu:cpu_chip"
type: "item"
}
]
title: "{quests.medium_voltage.mv_cpu.title}"
x: 5.0d
y: 8.0d
}
]
subtitle: ["{quests.medium_voltage.subtitle}"]
title: "{quests.medium_voltage}"

View file

@ -640,4 +640,8 @@ function removeGTCEURecipes(event) {
event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__fireclay' })
event.remove({ id: 'gtceu:smelting/sticky_resin_from_slime' })
// Remove vanilla Eye of Ender
event.remove({ id: 'minecraft:ender_eye' })
}