Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pakku

Browse Source
This commit is contained in:
Xikaro
2024-10-26 21:15:36 +05:00
committed by GitHub
parent 6f27a7feff 98bb29394c
commit e7993c887a
13 changed files with 548 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -37,6 +37,7 @@
- Simplified alternator multiblock reques and it controller block recipe.
- Added better recipes for any wood (nether wood too).
- Added stripping recipes in emi world interaction page.
- And another 2123462384234 fixed, tweaks, and etc.
- ...
### Updated mods
- ??

4
config/embeddium-options.json
View File

@@ -24,7 +24,7 @@
},
"notifications": {
"force_disable_donation_prompts": false,
"has_cleared_donation_button": false,
"has_seen_donation_prompt": false
"has_cleared_donation_button": true,
"has_seen_donation_prompt": true
}
}

310
config/ftbquests/quests/chapters/primitive_age.snbt
View File

@@ -371,11 +371,7 @@
}
{
dependencies: ["76EF4D00586A8B74"]
description: [
"{quests.387DEEADF4922AB3.d1}"
""
"{ \"text\": \"Excel Link (Tap here)\", \"color\":\"#02FF00\", \"clickEvent\": { \"action\": \"open_url\", \"value\": \"https://docs.google.com/spreadsheets/d/1P3Baz4y5vgJ3XrCoNs4l3BXGPiFEPlW7i4taPEWpTB4\" } }"
]
description: ["{quests.387DEEADF4922AB3.d1}"]
icon: "gtceu:shale_aluminium_ore"
id: "387DEEADF4922AB3"
subtitle: "{quests.387DEEADF4922AB3.st}"
@@ -1736,8 +1732,9 @@
hide_dependency_lines: true
id: "3029097F88B8AABF"
size: 1.5d
subtitle: "Broke ore using Hammer (Not Mining Hammer)"
tasks: [{
id: "37D21B5266C73385"
id: "0F58D0E86DAC23CD"
item: "gtceu:crushed_graphite_ore"
type: "item"
}]
@@ -2233,12 +2230,12 @@
hide_dependency_lines: true
id: "73BF0075860E666B"
tasks: [{
id: "54334DA4AC22438E"
id: "0B0CF81DC4968709"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(tfc:ore/small_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:rich_raw_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(tfc:ore/small_native_copper)item(gtceu:poor_raw_copper)item(minecraft:raw_copper)item(gtceu:rich_raw_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
@@ -2263,32 +2260,29 @@
id: "2DEEDED2F21E60B9"
tasks: [
{
id: "024533C5E4B89787"
id: "61FBFAD12DD6486F"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any tin ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_cassiterite)item(gtceu:raw_tin)item(gtceu:raw_cassiterite)item(gtceu:raw_cassiterite_sand)item(gtceu:poor_raw_tin)item(gtceu:poor_raw_cassiterite)item(gtceu:poor_raw_cassiterite_sand)item(gtceu:rich_raw_tin)item(gtceu:rich_raw_cassiterite)item(gtceu:rich_raw_cassiterite_sand))"
}
}
title: "Any Tin Ore"
type: "item"
}
{
id: "26C207A03F30FB27"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(tfc:ore/small_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:rich_raw_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(tfc:ore/small_native_copper)item(gtceu:poor_raw_copper)item(minecraft:raw_copper)item(gtceu:rich_raw_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
type: "item"
}
{
id: "4A4A9E47E7251680"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_cassiterite)item(gtceu:tiny_tin_dust)item(gtceu:tiny_cassiterite_sand_dust)item(gtceu:tiny_cassiterite_dust)item(gtceu:raw_tin)item(gtceu:raw_cassiterite)item(gtceu:raw_cassiterite_sand)item(gtceu:rich_raw_tin)item(gtceu:rich_raw_cassiterite)item(gtceu:rich_raw_cassiterite_sand)item(gtceu:poor_raw_tin)item(gtceu:poor_raw_cassiterite)item(gtceu:poor_raw_cassiterite_sand))"
}
}
title: "Any Tin Ore"
type: "item"
}
]
title: "Resources for ordinary bronze"
x: 18.5d
@@ -2299,12 +2293,12 @@
hide_dependency_lines: true
id: "566FA805413004CF"
tasks: [{
id: "7E987D9B30125F52"
id: "74026020BB7FD0C8"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:rich_raw_hematite)item(gtceu:raw_hematite)item(tfc:ore/small_hematite)item(gtceu:poor_raw_hematite)item(gtceu:rich_raw_yellow_limonite)item(tfc:ore/small_limonite)item(gtceu:poor_raw_yellow_limonite)item(gtceu:raw_yellow_limonite)item(tfc:ore/small_magnetite)item(gtceu:poor_raw_magnetite)item(gtceu:raw_magnetite)item(gtceu:rich_raw_magnetite)item(gtceu:poor_raw_iron)item(minecraft:raw_iron)item(gtceu:rich_raw_iron)item(gtceu:poor_raw_goethite)item(gtceu:raw_goethite)item(gtceu:rich_raw_goethite)item(gtceu:poor_raw_pyrite)item(gtceu:raw_pyrite)item(gtceu:rich_raw_pyrite)item(gtceu:crushed_yellow_limonite_ore))"
"ftbfiltersystem:filter": "or(item(minecraft:raw_iron)item(tfc:ore/small_hematite)item(tfc:ore/small_magnetite)item(tfc:ore/small_limonite)item(gtceu:tiny_iron_dust)item(gtceu:tiny_hematite_dust)item(gtceu:tiny_goethite_dust)item(gtceu:tiny_magnetite_dust)item(gtceu:tiny_pyrite_dust)item(gtceu:tiny_yellow_limonite_dust)item(gtceu:raw_hematite)item(gtceu:raw_goethite)item(gtceu:raw_pyrite)item(gtceu:raw_yellow_limonite)item(gtceu:poor_raw_iron)item(gtceu:poor_raw_hematite)item(gtceu:poor_raw_goethite)item(gtceu:poor_raw_magnetite)item(gtceu:poor_raw_pyrite)item(gtceu:poor_raw_yellow_limonite)item(gtceu:rich_raw_iron)item(gtceu:rich_raw_hematite)item(gtceu:rich_raw_goethite)item(gtceu:rich_raw_magnetite)item(gtceu:rich_raw_pyrite)item(gtceu:rich_raw_yellow_limonite))"
}
}
title: "Any Iron Ore"
@@ -2400,47 +2394,41 @@
subtitle: "Cheap and shiny"
tasks: [
{
id: "7EBB6EC50EE8CFA1"
id: "72D482BA2D14A873"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any bismuth ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_bismuthinite)item(gtceu:raw_bismuth)item(gtceu:poor_raw_bismuth)item(gtceu:rich_raw_bismuth))"
}
}
title: "Any Bismuth Ore"
type: "item"
}
{
id: "51BEF595B2A3014C"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any sphalerite ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_sphalerite)item(gtceu:raw_sphalerite)item(gtceu:poor_raw_sphalerite)item(gtceu:rich_raw_sphalerite))"
}
}
title: "Any Sphalerite Ore"
type: "item"
}
{
id: "74F88351793C165A"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(tfc:ore/small_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:rich_raw_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(tfc:ore/small_native_copper)item(gtceu:poor_raw_copper)item(minecraft:raw_copper)item(gtceu:rich_raw_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
type: "item"
}
{
id: "7EE7D70C8B855FD4"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_sphalerite)item(gtceu:tiny_zinc_dust)item(gtceu:tiny_sphalerite_dust)item(gtceu:raw_sphalerite)item(gtceu:poor_raw_sphalerite)item(gtceu:rich_raw_sphalerite))"
}
}
title: "Any Zinc Ore"
type: "item"
}
{
id: "0828B00285E5DBD8"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:tiny_bismuth_dust)item(tfc:ore/small_bismuthinite)item(gtceu:raw_bismuth)item(gtceu:rich_raw_bismuth)item(gtceu:poor_raw_bismuth))"
}
}
title: "Any Bismuth Ore"
type: "item"
}
]
title: "Resources for Bismuth bronze"
x: 18.5d
@@ -2463,39 +2451,36 @@
subtitle: "Expensive and black"
tasks: [
{
id: "1294B28A98775920"
id: "45C62339992715C9"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any silver ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_silver)item(gtceu:poor_raw_silver)item(gtceu:rich_raw_silver)item(gtceu:raw_silver))"
}
}
title: "Any Silver Ore"
type: "item"
}
{
id: "53F7A77859F53B3D"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(tfc:ore/small_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:rich_raw_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(tfc:ore/small_native_copper)item(gtceu:poor_raw_copper)item(minecraft:raw_copper)item(gtceu:rich_raw_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
type: "item"
}
{
id: "755505207091F3E2"
id: "5461C4FA5EAD78F0"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(minecraft:raw_gold)item(gtceu:rich_raw_gold)item(gtceu:poor_raw_gold)item(tfc:ore/small_native_gold))"
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_silver)item(gtceu:tiny_silver_dust)item(gtceu:raw_silver)item(gtceu:rich_raw_silver)item(gtceu:poor_raw_silver))"
}
}
title: "Any Silver Ore"
type: "item"
}
{
id: "0DE4CC2BCDE489C0"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(minecraft:raw_gold)item(tfc:ore/small_native_gold)item(gtceu:poor_raw_gold)item(gtceu:rich_raw_gold)item(gtceu:tiny_gold_dust))"
}
}
title: "Any Gold Ore"
@@ -2742,7 +2727,11 @@
y: 7.5d
}
{
dependencies: ["2765DB2E20A745F8"]
dependencies: [
"2765DB2E20A745F8"
"48AED37B4E20A99A"
]
dependency_requirement: "one_completed"
description: ["{quests.478D0DF94D7495EF.d1}"]
id: "478D0DF94D7495EF"
subtitle: "{quests.478D0DF94D7495EF.st}"
@@ -3022,6 +3011,7 @@
dependencies: ["0EB682B44D83D12A"]
hide_dependency_lines: true
id: "253860AD4DF4224C"
subtitle: "Broke ore using Hammer (Not Mining Hammer)"
tasks: [{
id: "6E70D453F693036D"
item: "gtceu:crushed_sulfur_ore"
@@ -3250,15 +3240,12 @@
type: "item"
}
{
id: "305EFF0F0ECD2E16"
id: "45979C3F7588F352"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"Any Nickel Ore\"}"
}
"ftbfiltersystem:filter": "or(item(gtceu:raw_nickel)item(gtceu:raw_garnierite)item(gtceu:raw_pentlandite)item(gtceu:rich_raw_nickel)item(gtceu:rich_raw_garnierite)item(gtceu:rich_raw_pentlandite)item(gtceu:poor_raw_nickel)item(gtceu:poor_raw_garnierite)item(gtceu:poor_raw_pentlandite))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_nickel_dust)item(gtceu:tiny_garnierite_dust)item(gtceu:raw_nickel)item(gtceu:raw_garnierite)item(tfc:ore/small_garnierite)item(gtceu:poor_raw_nickel)item(gtceu:poor_raw_garnierite)item(gtceu:rich_raw_nickel)item(gtceu:rich_raw_garnierite))"
}
}
title: "Any Nickel Ore"
@@ -3576,24 +3563,24 @@
id: "483D7FE6554FDC96"
tasks: [
{
id: "184806817B6D9921"
id: "7ED98EFD0C27E0FD"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_gold)item(gtceu:poor_raw_gold)item(minecraft:raw_gold)item(gtceu:rich_raw_gold))"
"ftbfiltersystem:filter": "or(item(minecraft:raw_gold)item(tfc:ore/small_native_gold)item(gtceu:poor_raw_gold)item(gtceu:rich_raw_gold)item(gtceu:tiny_gold_dust))"
}
}
title: "Any Gold Ore"
type: "item"
}
{
id: "3101B42F9E34CDA1"
id: "2A88B5EB303D2265"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_copper)item(minecraft:raw_copper)item(gtceu:poor_raw_copper)item(tfc:ore/small_native_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
@@ -3620,27 +3607,24 @@
id: "758B2176634789F6"
tasks: [
{
id: "763128F1BD1FEB9B"
id: "10F5386F960AE8C8"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any sphalerite ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_sphalerite)item(gtceu:raw_sphalerite)item(gtceu:poor_raw_sphalerite)item(gtceu:rich_raw_sphalerite))"
"ftbfiltersystem:filter": "or(item(tfc:ore/small_sphalerite)item(gtceu:tiny_zinc_dust)item(gtceu:tiny_sphalerite_dust)item(gtceu:raw_sphalerite)item(gtceu:poor_raw_sphalerite)item(gtceu:rich_raw_sphalerite))"
}
}
title: "Any Sphalerite Ore"
title: "Any Zinc Ore"
type: "item"
}
{
id: "34F5CDD35DDE2295"
id: "1F79B37BB871845A"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_copper)item(minecraft:raw_copper)item(gtceu:poor_raw_copper)item(tfc:ore/small_native_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
@@ -3667,32 +3651,29 @@
id: "0E0C589495AA31E8"
tasks: [
{
id: "3E9AC72D1AF2CE1A"
id: "27FEFEA3A46F09FD"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any silver ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_silver)item(gtceu:poor_raw_silver)item(gtceu:rich_raw_silver)item(gtceu:raw_silver))"
}
}
title: "Any Silver Ore"
type: "item"
}
{
id: "4E12D679975AEE9A"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_copper)item(minecraft:raw_copper)item(gtceu:poor_raw_copper)item(tfc:ore/small_native_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
type: "item"
}
{
id: "6897CE0365F602F1"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_silver)item(gtceu:tiny_silver_dust)item(gtceu:raw_silver)item(gtceu:rich_raw_silver)item(gtceu:poor_raw_silver))"
}
}
title: "Any Silver Ore"
type: "item"
}
]
title: "Materials for Sterling Silver"
x: 30.5d
@@ -4863,7 +4844,12 @@
y: 24.0d
}
{
dependencies: ["2765DB2E20A745F8"]
dependencies: [
"2765DB2E20A745F8"
"48AED37B4E20A99A"
"39E8CE6A86731567"
]
dependency_requirement: "one_completed"
id: "04D4E196824D53C4"
tasks: [{
id: "0121A0A3EFBF3A46"
@@ -4967,7 +4953,7 @@
}
]
title: "Copper Waxing [WIP]"
x: -8.0d
x: -9.5d
y: 0.0d
}
{
@@ -4977,7 +4963,7 @@
title: "Cellar [WIP]"
type: "checkmark"
}]
x: -7.0d
x: -8.5d
y: -1.0d
}
{
@@ -4987,7 +4973,7 @@
title: "Bees [WIP]"
type: "checkmark"
}]
x: -7.0d
x: -8.5d
y: 1.0d
}
{
@@ -4997,7 +4983,7 @@
title: "Greenhouse [WIP]"
type: "checkmark"
}]
x: -7.0d
x: -8.5d
y: 0.0d
}
{
@@ -5127,8 +5113,8 @@
item: "etched:etching_table"
type: "item"
}]
x: 24.5d
y: 25.5d
x: 8.0d
y: 24.5d
}
{
dependencies: ["6156D157921CC5A8"]
@@ -5138,8 +5124,8 @@
item: "etched:album_jukebox"
type: "item"
}]
x: 23.0d
y: 24.0d
x: 6.5d
y: 23.0d
}
{
dependencies: ["6156D157921CC5A8"]
@@ -5149,8 +5135,8 @@
item: "etched:radio"
type: "item"
}]
x: 26.0d
y: 25.5d
x: 9.5d
y: 24.5d
}
{
dependencies: ["6156D157921CC5A8"]
@@ -5160,8 +5146,8 @@
item: "etched:jukebox_minecart"
type: "item"
}]
x: 23.0d
y: 25.5d
x: 6.5d
y: 24.5d
}
{
dependencies: ["6156D157921CC5A8"]
@@ -5171,8 +5157,8 @@
item: "etched:boombox"
type: "item"
}]
x: 26.0d
y: 24.0d
x: 9.5d
y: 23.0d
}
{
dependencies: ["754CA10FD1725EC6"]
@@ -5188,8 +5174,8 @@
}
type: "item"
}]
x: 24.5d
y: 23.0d
x: 8.0d
y: 22.0d
}
{
dependencies: [
@@ -5203,8 +5189,8 @@
item: "etched:album_cover"
type: "item"
}]
x: 24.5d
y: 22.0d
x: 8.0d
y: 21.0d
}
{
dependencies: ["38469FBD2B7998C1"]
@@ -5214,9 +5200,69 @@
item: "etched:blank_music_disc"
type: "item"
}]
x: 8.0d
y: 23.0d
}
{
dependencies: ["23DD6D6E78F62757"]
id: "2B862C1ED65D0526"
shape: "gear"
size: 3.0d
tasks: [{
id: "7DB951FDB7063659"
item: "gtceu:steel_brick_casing"
type: "item"
}]
x: 24.5d
y: 24.0d
}
{
dependencies: ["445E060EF3300A49"]
id: "23DD6D6E78F62757"
tasks: [{
count: 5L
id: "1C607358F45ABAD6"
item: {
Count: 1
ForgeCaps: {
"tfc:item_heat": {
heat: 0.0f
ticks: 0L
}
}
id: "gtceu:steel_plate"
}
type: "item"
}]
x: 24.5d
y: 22.0d
}
{
dependencies: ["76EF4D00586A8B74"]
description: ["But how? Try to descend to a depth of y = -60 blocks. Or perhaps lower?"]
id: "30C61004FB5FA9AC"
tasks: [{
dimension: "minecraft:the_nether"
id: "2928FC0BBF500E88"
title: "Visit Nether"
type: "dimension"
}]
x: -5.5d
y: 0.0d
}
{
dependencies: ["30C61004FB5FA9AC"]
description: ["Maybe you need to climb as high as possible? But I'm not sure."]
id: "53C8B91A1A5BBE3E"
tasks: [{
dimension: "minecraft:overworld"
id: "162808CB268A36CE"
title: "How to escape from Alcatrazzz?"
type: "dimension"
}]
x: -7.0d
y: 0.0d
}
]
title: "Primitive Age"
}

399
config/ftbquests/quests/chapters/steam_age.snbt
View File

@@ -10,58 +10,71 @@
{
id: "1C86D83D29134EBE"
linked_quest: "253860AD4DF4224C"
x: 5.5d
x: -2.5d
y: -6.0d
}
{
id: "09E0E263CC81CD99"
linked_quest: "2658E7679CD42ACD"
x: 9.0d
y: 4.5d
shape: "circle"
x: 3.5d
y: 1.0d
}
{
id: "26D1A18BE2F694C4"
linked_quest: "6E13B0241CB1D536"
x: 7.5d
y: 3.0d
x: -4.0d
y: -3.0d
}
{
id: "580358D6164B9CEA"
linked_quest: "04D4E196824D53C4"
x: 2.5d
y: -1.5d
x: -5.5d
y: 0.0d
}
{
id: "4DFB0BF29099F2A1"
linked_quest: "5BBF0B6AED98072E"
x: 2.5d
y: 0.0d
shape: "circle"
x: -6.5d
y: 1.5d
}
{
id: "190A7A8C49F390C2"
linked_quest: "478D0DF94D7495EF"
x: 1.0d
y: -4.5d
x: -5.5d
y: -3.0d
}
{
id: "3426BCAE1210DAE4"
linked_quest: "3FB3EE093DDC6B56"
shape: "gear"
size: 3.0d
x: -7.5d
x: -12.5d
y: 0.0d
}
{
id: "3E93FFAACC24EEA5"
linked_quest: "7B74DB051202E97E"
x: 11.5d
y: -1.0d
}
{
id: "5554A5384B8FBED2"
linked_quest: "3E82C14AF32AA103"
x: -4.5d
y: -3.0d
shape: "gear"
size: 2.0d
x: -7.5d
y: -9.0d
}
{
id: "53F621640316AE50"
linked_quest: "2B862C1ED65D0526"
shape: "gear"
size: 3.0d
x: -10.0d
y: 5.98333333333332d
}
{
id: "4B34A70CD02F5F2D"
linked_quest: "7B74DB051202E97E"
shape: "circle"
x: -4.0d
y: -1.5d
}
]
quests: [
@@ -85,7 +98,7 @@
type: "item"
}]
title: "S is for Sulfur"
x: 5.5d
x: -2.5d
y: -4.5d
}
{
@@ -109,7 +122,7 @@
type: "item"
}]
title: "The First of Many Motors"
x: 7.5d
x: 2.0d
y: -3.0d
}
{
@@ -128,7 +141,7 @@
"&l&3Lore:&r&o These drums are actually ported from GregTech 6."
]
id: "2B74E56C9E138F18"
shape: "rsquare"
shape: "circle"
size: 1.0d
subtitle: "Just kidding, tanks for fluids"
tasks: [{
@@ -137,8 +150,8 @@
type: "item"
}]
title: "Armoured Tanks"
x: -9.0d
y: -3.0d
x: -13.5d
y: -3.5d
}
{
dependencies: ["3F087862270F649A"]
@@ -171,11 +184,14 @@
}
]
title: "Molding"
x: 2.5d
y: -3.0d
x: -1.0d
y: -4.5d
}
{
dependencies: ["5BBF0B6AED98072E"]
dependencies: [
"5BBF0B6AED98072E"
"612C0D994EAF0CB6"
]
description: [
"Not many items are made in the &3Extractor&r during the &6Steam Age&r, but it's used to make &9Rubber&r, which you'll need after Steel."
""
@@ -187,12 +203,12 @@
subtitle: "The Steam Extractor extracts..."
tasks: [{
id: "12A46916B1BC17EC"
item: "gtceu:hp_steam_extractor"
item: "gtceu:lp_steam_extractor"
type: "item"
}]
title: "Steam Extractor"
x: 4.0d
y: 0.0d
x: -4.0d
y: 3.0d
}
{
dependencies: [
@@ -226,7 +242,7 @@
}
]
title: "Rubbering up"
x: 5.5d
x: -1.0d
y: -3.0d
}
{
@@ -251,8 +267,8 @@
type: "item"
}]
title: "Electronics #1: Resistors"
x: 9.0d
y: 3.0d
x: 2.0d
y: 1.0d
}
{
dependencies: ["3FB3EE093DDC6B56"]
@@ -289,30 +305,11 @@
type: "item"
}]
title: "Fluid Pipes"
x: -7.5d
y: -3.0d
x: -12.5d
y: -2.0d
}
{
dependencies: ["3F087862270F649A"]
description: [
"&dSteam Machines&r accept any Steam that is pumped from nearby Boilers into their internal storage tank. They will run recipes from JEI up to 32 EU/t (&7LV&r-tier)."
""
"&6This quest unlocks a new tutorial on Steam in the &lTips and Tricks&r&6 tab - check it out to learn more!&r"
]
id: "03DBF1961AE21C76"
shape: "square"
size: 1.0d
tasks: [{
id: "03BA041BE9C347FD"
item: "gtceu:steel_brick_casing"
type: "item"
}]
title: "Steam Machine Behaviour"
x: -0.5d
y: 0.0d
}
{
dependencies: ["03DBF1961AE21C76"]
dependencies: ["612C0D994EAF0CB6"]
description: [
"The &bAlloy Smelter&r is used for, well, alloys. You'll want it for the efficient &6Bronze&r recipe, and for &4Red Alloy&r in the near future."
""
@@ -324,15 +321,18 @@
subtitle: "The Alloy Smelter makes alloys..."
tasks: [{
id: "2F3B195A110E41C2"
item: "gtceu:hp_steam_alloy_smelter"
item: "gtceu:lp_steam_alloy_smelter"
type: "item"
}]
title: "Steam Alloy Smelter"
x: 2.5d
y: 1.5d
x: -5.5d
y: 3.0d
}
{
dependencies: ["04D4E196824D53C4"]
dependencies: [
"04D4E196824D53C4"
"7B74DB051202E97E"
]
description: [
"Crafting Vacuum Tubes might make you question your existence. Sorry about that."
""
@@ -350,8 +350,8 @@
type: "item"
}]
title: "Electronics #3: Vacuum Tubes"
x: 4.0d
y: -1.5d
x: -4.0d
y: 0.0d
}
{
dependencies: ["48AED37B4E20A99A"]
@@ -372,7 +372,7 @@
type: "item"
}]
title: "Red Alloy"
x: 4.0d
x: -4.0d
y: 1.5d
}
{
@@ -414,7 +414,7 @@
}
]
title: "Electronics #4: The Circuit"
x: 9.0d
x: 2.0d
y: -1.0d
}
{
@@ -432,7 +432,7 @@
]
icon: "gtceu:potin_normal_fluid_pipe"
id: "3C70B0717E9377A4"
shape: "rsquare"
shape: "circle"
size: 1.0d
subtitle: "...I'm going into battle, and I need only your finest Potin."
tasks: [{
@@ -448,11 +448,11 @@
type: "item"
}]
title: "Potin Seller..."
x: -7.5d
y: -4.5d
x: -12.5d
y: -3.5d
}
{
dependencies: ["03DBF1961AE21C76"]
dependencies: ["612C0D994EAF0CB6"]
description: [
"With the creation of this machine, many recipes that once required you to use a hammer can instead be made here!"
""
@@ -468,15 +468,15 @@
subtitle: "The Forge Hammer hammers..."
tasks: [{
id: "4F4074D7CE5A61A0"
item: "gtceu:hp_steam_forge_hammer"
item: "gtceu:lp_steam_forge_hammer"
type: "item"
}]
title: "Steam Forge Hammer"
x: 1.0d
y: -1.5d
x: -1.0d
y: 3.0d
}
{
dependencies: ["03DBF1961AE21C76"]
dependencies: ["612C0D994EAF0CB6"]
description: [
"The &bMacerator&r frees you from the painful process of &egrinding stuff into dust&r with a &3Mortar&r, but at the steep cost of time. Processing a single piece of Iron Ore in this machine will take &ctwenty seconds&r - twice the time it takes to smelt an ingot in a furnace!"
""
@@ -492,11 +492,11 @@
subtitle: "The Macerator macerates..."
tasks: [{
id: "6DFD6AC8CF31305C"
item: "gtceu:hp_steam_macerator"
item: "gtceu:lp_steam_macerator"
type: "item"
}]
title: "Steam Macerator"
x: -0.5d
x: -2.5d
y: 3.0d
}
{
@@ -530,8 +530,8 @@
}
]
title: "Electronics #2: Circuit Boards"
x: 5.5d
y: 3.0d
x: -2.5d
y: -3.0d
}
{
dependencies: ["1C50A758A1DE25CB"]
@@ -555,7 +555,7 @@
type: "checkmark"
}]
title: "What is this Mess?!"
x: -0.5d
x: -3.0d
y: 4.5d
}
{
@@ -569,7 +569,7 @@
]
icon: "gtceu:steam_grinder"
id: "7FF95F1216D104B2"
shape: "square"
shape: "circle"
size: 1.0d
subtitle: "The Steam Oven's elder brother"
tasks: [
@@ -601,11 +601,11 @@
}
]
title: "Steam Grinder"
x: 1.0d
x: -2.0d
y: 4.5d
}
{
dependencies: ["011EC2CE0111C9A0"]
dependencies: ["3B8D9846F50DEF34"]
description: [
"&o...or little brother. Don't let him know!&r"
""
@@ -656,24 +656,24 @@
}
]
title: "Steam Oven"
x: -6.0d
y: 4.5d
x: -7.5d
y: -1.5d
}
{
dependencies: ["03DBF1961AE21C76"]
dependencies: ["612C0D994EAF0CB6"]
description: ["The Steam Compressor unlocks some tantalising new recipes that will help you to progress towards Steel."]
id: "07415D6305C3B1D2"
shape: "rsquare"
shape: "square"
size: 1.0d
subtitle: "The Steam Compressor compresses..."
tasks: [{
id: "21C99D59F1BE48A3"
item: "gtceu:hp_steam_compressor"
item: "gtceu:lp_steam_compressor"
type: "item"
}]
title: "Steam Compressor"
x: -0.5d
y: -1.5d
x: 0.5d
y: 3.0d
}
{
dependencies: ["48AED37B4E20A99A"]
@@ -700,7 +700,7 @@
]
icon: "gtceu:tin_small_item_pipe"
id: "539CF1B85725786D"
shape: "rsquare"
shape: "circle"
size: 1.0d
tasks: [{
id: "158F4EEDC214A3BA"
@@ -718,30 +718,30 @@
type: "item"
}]
title: "Item Pipes"
x: 2.5d
x: -6.5d
y: 4.5d
}
{
dependencies: ["3F087862270F649A"]
dependencies: ["3B8D9846F50DEF34"]
id: "011EC2CE0111C9A0"
tasks: [{
id: "7A1C685F48E09F6B"
item: "gtceu:hp_steam_furnace"
type: "item"
}]
x: -6.0d
y: 3.0d
x: -7.5d
y: 6.0d
}
{
dependencies: ["3F087862270F649A"]
dependencies: ["2F44D9034CBEB774"]
id: "41F23E44E154C3E9"
tasks: [{
id: "22542CDE2F0C0524"
item: "gtceu:hp_steam_rock_crusher"
type: "item"
}]
x: -3.0d
y: 3.0d
x: 2.0d
y: 6.0d
}
{
dependencies: [
@@ -755,12 +755,13 @@
item: "gtceu:glass_dust"
type: "item"
}]
x: 1.0d
y: -3.0d
x: -5.5d
y: -1.5d
}
{
dependencies: ["3FB3EE093DDC6B56"]
id: "7470E713F599B891"
shape: "circle"
tasks: [{
id: "0DF1243A3267F636"
item: {
@@ -770,19 +771,17 @@
"ftbfiltersystem:filter": "or(item(gtceu:lp_steam_solid_boiler)item(gtceu:lp_steam_liquid_boiler)item(gtceu:lp_steam_solar_boiler))"
}
}
title: "Any Low Pressure Boiler"
title: "Any Low Pressure Steam Boiler"
type: "item"
}]
x: -6.0d
y: -3.0d
x: -11.5d
y: -3.5d
}
{
dependencies: [
"3FB3EE093DDC6B56"
"445E060EF3300A49"
]
dependencies: ["2B862C1ED65D0526"]
id: "3F087862270F649A"
size: 2.0d
shape: "circle"
size: 1.0d
tasks: [{
id: "0BBF678F5A0517D7"
item: {
@@ -795,8 +794,8 @@
title: "Any High Pressure Boiler"
type: "item"
}]
x: -4.5d
y: 0.0d
x: -10.0d
y: 9.5d
}
{
dependencies: ["3E82C14AF32AA103"]
@@ -807,19 +806,22 @@
item: "gtceu:treated_wood_planks"
type: "item"
}]
x: -4.5d
y: -5.5d
x: -4.0d
y: -9.0d
}
{
dependencies: ["0A522CC855BF3FEC"]
dependencies: [
"0A522CC855BF3FEC"
"55DD22C8ECBEE079"
]
id: "252FD7ED5BF225DD"
tasks: [{
id: "5E4B2C29C7893EF8"
item: "gtceu:treated_wood_plate"
type: "item"
}]
x: -4.5d
y: -7.0d
x: -2.5d
y: -9.0d
}
{
dependencies: [
@@ -829,15 +831,182 @@
icon: "create:large_cogwheel"
id: "5CB27C93795281AB"
shape: "gear"
size: 2.0d
size: 3.0d
tasks: [{
id: "0D3B31329089CFE4"
item: "create:cogwheel"
type: "item"
}]
title: "The beginning of Create"
x: -0.5d
y: -7.0d
x: 0.5d
y: -9.0d
}
{
dependencies: ["07415D6305C3B1D2"]
description: ["The Steam Compressor unlocks some tantalising new recipes that will help you to progress towards Steel."]
id: "54CA9AF368FCC274"
size: 1.0d
subtitle: "The Steam Compressor compresses..."
tasks: [{
id: "5CA938E8348E4228"
item: "gtceu:hp_steam_compressor"
type: "item"
}]
title: "Steam Compressor"
x: 0.5d
y: 6.0d
}
{
dependencies: ["1C50A758A1DE25CB"]
description: [
"The &bMacerator&r frees you from the painful process of &egrinding stuff into dust&r with a &3Mortar&r, but at the steep cost of time. Processing a single piece of Iron Ore in this machine will take &ctwenty seconds&r - twice the time it takes to smelt an ingot in a furnace!"
""
"The Macerator also marks the advent of &eOre Processing&r, but that's a scary topic that we'll dip our toes into in the next quest."
"{@pagebreak}"
"The macerator will output only the first item shown in recipes from JEI. The other slots are locked until you make a &6HV&r Macerator. How unfortunate..."
""
"Our (&oimportant!&r) advice: it's actually better to keep directly smelting for now! The efficiency loss is made up with faster mining. Use the Macerator to make things like &aClay Dust&r instead!"
]
id: "79F8CCB9AAC2418A"
shape: "square"
size: 1.0d
subtitle: "The Macerator macerates..."
tasks: [{
id: "63E61AE537B5ED1F"
item: "gtceu:hp_steam_macerator"
type: "item"
}]
title: "Steam Macerator"
x: -2.5d
y: 6.0d
}
{
dependencies: ["48AED37B4E20A99A"]
description: [
"The &bAlloy Smelter&r is used for, well, alloys. You'll want it for the efficient &6Bronze&r recipe, and for &4Red Alloy&r in the near future."
""
"Out of all the &6Steam Age&r machines, this is the most steam-hungry. If you ever find yourself running out of steam, give your machine a &alove-tap&r with &dany Soft Mallet&r to momentarily pause it."
]
id: "33B6BA83EA354B24"
shape: "square"
size: 1.0d
subtitle: "The Alloy Smelter makes alloys..."
tasks: [{
id: "320681036ECB878D"
item: "gtceu:hp_steam_alloy_smelter"
type: "item"
}]
title: "Steam Alloy Smelter"
x: -5.5d
y: 6.0d
}
{
dependencies: ["1436DB89E21264F3"]
description: [
"Not many items are made in the &3Extractor&r during the &6Steam Age&r, but it's used to make &9Rubber&r, which you'll need after Steel."
""
"You can also process Dirt in the Extractor for &aBones&r, which makes getting &aBone Meal&r a lot easier for Peaceful players."
]
id: "152A238740E6ADA8"
shape: "square"
size: 1.0d
subtitle: "The Steam Extractor extracts..."
tasks: [{
id: "3167FD92D7FB37B5"
item: "gtceu:hp_steam_extractor"
type: "item"
}]
title: "Steam Extractor"
x: -4.0d
y: 6.0d
}
{
dependencies: ["1931FC6DEAC29646"]
description: [
"With the creation of this machine, many recipes that once required you to use a hammer can instead be made here!"
""
"It can process &bCobblestone into Gravel&r, and &dGravel into Sand&r - and it's zippy at that to boot."
""
"Last but not least, it makes &aPlates&r at a better ratio: &6three Ingots for two Plates&r. A worthwhile investment!"
""
"You know what? &aBonus&r! We'll give you the &8Anvil&r back if you craft the Forge Hammer. This is a gentle reminder that you can repair GregTech tools in an Anvil."
]
id: "2AD496393F5F9421"
shape: "square"
size: 1.0d
subtitle: "The Forge Hammer hammers..."
tasks: [{
id: "08DB1E42BA032AAD"
item: "gtceu:hp_steam_forge_hammer"
type: "item"
}]
title: "Steam Forge Hammer"
x: -1.0d
y: 6.0d
}
{
dependencies: ["3FB3EE093DDC6B56"]
description: [
"&dSteam Machines&r accept any Steam that is pumped from nearby Boilers into their internal storage tank. They will run recipes from JEI up to 32 EU/t (&7LV&r-tier)."
""
"&6This quest unlocks a new tutorial on Steam in the &lTips and Tricks&r&6 tab - check it out to learn more!&r"
]
id: "3E1DF79F85C2AD99"
shape: "gear"
subtitle: "Open me, its important, or not?"
tasks: [{
id: "635CBC166F9FD406"
title: "Some useful info about steam"
type: "checkmark"
}]
x: -10.0d
y: 0.0d
}
{
dependencies: ["3E1DF79F85C2AD99"]
id: "612C0D994EAF0CB6"
shape: "gear"
size: 3.0d
tasks: [{
id: "78EB6ABEE40D1867"
item: "gtceu:bronze_machine_casing"
type: "item"
}]
x: -10.0d
y: 3.0d
}
{
dependencies: ["3E1DF79F85C2AD99"]
id: "3B8D9846F50DEF34"
tasks: [{
id: "5C54AF2AC3307B4A"
item: "gtceu:lp_steam_furnace"
type: "item"
}]
x: -7.5d
y: 0.0d
}
{
dependencies: ["612C0D994EAF0CB6"]
id: "2F44D9034CBEB774"
tasks: [{
id: "6F2953EC4D8DEF27"
item: "gtceu:lp_steam_rock_crusher"
type: "item"
}]
x: 2.0d
y: 3.0d
}
{
dependencies: ["1C50A758A1DE25CB"]
id: "55DD22C8ECBEE079"
tasks: [{
id: "5B70E7F9DB1372B0"
item: "gtceu:treated_wood_dust"
type: "item"
}]
x: -2.5d
y: -7.5d
}
]
subtitle: ["Harness the power of Steam and learn the basics"]

2
config/gtceu.yaml
View File

@@ -190,7 +190,7 @@ machines:
# Whether Steam Multiblocks should use Steel instead of Bronze.
# Default: false
steelSteamMultiblocks: true
steelSteamMultiblocks: false
# Whether to enable the cleanroom, required for various recipes.
# Default: true

2
kubejs/assets/tfg/lang/en_us.json
View File

@@ -34,7 +34,7 @@
"quests.387DEEADF4922AB3.t": "Ore generation in the TFG world",
"quests.387DEEADF4922AB3.st": "Much more fun than vanilla",
"quests.387DEEADF4922AB3.d1": "In TerraFirmaGreg ore is generated more interestingly than anywhere else. \n1. Each ore appears in its own rock. TFC adds many different rocks to the world, that is, you won’t find a regular vanilla stone anywhere, so ores, like in real life, are generated only in certain rocks. \n2. There are several types of ore veins, such as: cluster, sphere, pipe and a few rare others that we will not talk about. \n3. To make life easier for players, ore indicators appear on the surface, under which in most cases the ore vein itself is located. \nTFG contains a small Wiki for this in an Excel spreadsheet. In order to follow the link, complete the task, then pick up the reward and a button will appear in the chat when you click on it, which will transfer you to an Excel table with ore generation.",
"quests.387DEEADF4922AB3.d1": "In TerraFirmaGreg ore is generated more interestingly than anywhere else. \n1. Each ore appears in its own rock. TFC adds many different rocks to the world, that is, you won’t find a regular vanilla stone anywhere, so ores, like in real life, are generated only in certain rocks. \n2. There are several types of ore veins, such as: cluster, sphere, pipe and a few rare others that we will not talk about. \n3. To make life easier for players, ore indicators appear on the surface, under which in most cases the ore vein itself is located. \nTo determine which rock a particular ore will spawn in, just open the explore EMI tabs, on one of them you will find the distribution of ores by dimensions and rocks.",
"quests.63E6C5684E12828C.st": "You need to drink water in order not to die, try to find a river or lake with ordinary water!",
"quests.63E6C5684E12828C.d1": "Use the right mouse button to drink some water. \nCareful! If you drink salt water you will experience increased thirst and will most likely die.",

2
kubejs/assets/tfg/lang/ru_ru.json
View File

@@ -34,7 +34,7 @@
"quests.387DEEADF4922AB3.t": "Генерация руд в мире TFG",
"quests.387DEEADF4922AB3.st": "Куда веселей чем в ванилле",
"quests.387DEEADF4922AB3.d1": "В TerraFirmaGreg руду генерируются интересней чем где либо. \n1. Каждая руда появляется в своей породе. TFC добавляет в мир много разных пород, то есть обычный камень из ваниллы вы нигде не встретите, поэтому руды как и в реальной жизни генерируются только в определенных породах. \n2. Существуют несколько типов рудных жил, такие как: кластер, сфера, труба и несколько редких других, о которых говорить не будем. \n3. Для облегчения жизни игрокам, на поверхности появляются рудные индикаторы, под которыми в большинстве случаев располагается сама жила с рудой. \nTFG содержит небольшое Wiki для этого в таблице Excel. Для того, чтобы перейти по ссылке, выполните задание, после заберите награду и в чате отобразится кнопка по нажатию на которую вас перебросит на таблицу Excel с генерацией руды.",
"quests.387DEEADF4922AB3.d1": "В TerraFirmaGreg руду генерируются интересней чем где либо. \n1. Каждая руда появляется в своей породе. TFC добавляет в мир много разных пород, то есть обычный камень из ваниллы вы нигде не встретите, поэтому руды как и в реальной жизни генерируются только в определенных породах. \n2. Существуют несколько типов рудных жил, такие как: кластер, сфера, труба и несколько редких других, о которых говорить не будем. \n3. Для облегчения жизни игрокам, на поверхности появляются рудные индикаторы, под которыми в большинстве случаев располагается сама жила с рудой. \nЧтобы определить в какой породе спавнится та или иная руда, просто откройте исследуйте вкладки EMI, на одной из них вы найдете распространение руд по измерениям и породам.",
"quests.63E6C5684E12828C.st": "Вам нужно пить воду, чтобы не умереть, постарайтсь найти реку или озеро с обычной водой!",
"quests.63E6C5684E12828C.d1": "Используйте правую кнопку мыши, чтобы выпить немного воды. \nОсторожно! Если вы выпьете соленой воды у вас появится эффект усиленной жажды и скорее всего вы умрете.",

4
kubejs/server_scripts/create/recipes.js
View File

@@ -104,10 +104,6 @@ const registerCreateRecipes = (e) => {
})
//#endregion
}
const dead = () => {
// Train Station
e.shapeless('2x create:track_station', [
'create:railway_casing',

65
kubejs/server_scripts/tfc/recipes.js
View File

@@ -308,12 +308,14 @@ const registerTFCRecipes = (e) => {
const processRichRawOre = (tagPrefix, tfcProperty, material, outputMaterial) => {
const oreItem = ChemicalHelper.get(tagPrefix, material, 1)
if (oreItem.isEmpty()) return
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(48, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/rich_raw/${material.getName()}`)
if (oreItem.isEmpty()) return
if (tfcProperty != null && outputMaterial != null) {
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(48, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/rich_raw/${material.getName()}`)
}
const crushedItem = ChemicalHelper.get(TagPrefix.crushed, material, 1)
if (crushedItem.isEmpty()) return
@@ -327,9 +329,11 @@ const registerTFCRecipes = (e) => {
const oreItem = ChemicalHelper.get(tagPrefix, material, 1)
if (oreItem.isEmpty()) return
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(36, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/raw/${material.getName()}`)
if (tfcProperty != null && outputMaterial != null) {
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(36, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/raw/${material.getName()}`)
}
const crushedItem = ChemicalHelper.get(TagPrefix.crushed, material, 1)
if (crushedItem.isEmpty()) return
@@ -343,10 +347,12 @@ const registerTFCRecipes = (e) => {
const processPoorRawOre = (tagPrefix, tfcProperty, material, outputMaterial) => {
const oreItem = ChemicalHelper.get(tagPrefix, material, 1)
if (oreItem.isEmpty()) return
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(24, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/poor_raw/${material.getName()}`)
if (tfcProperty != null && outputMaterial != null) {
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(24, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/poor_raw/${material.getName()}`)
}
const crushedItem = ChemicalHelper.get(TagPrefix.crushed, material, 1)
if (crushedItem.isEmpty()) return
@@ -1573,10 +1579,13 @@ const registerTFCRecipes = (e) => {
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
const tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)
const outputMaterial = (tfcProperty == null) ? material : (tfcProperty.getOutputMaterial() == null ? material : tfcProperty.getOutputMaterial())
processRichRawOre(TFGTagPrefix.richRawOre, tfcProperty, material, outputMaterial)
processNormalRawore(TagPrefix.rawOre, tfcProperty, material, outputMaterial)
processPoorRawOre(TFGTagPrefix.poorRawOre, tfcProperty, material, outputMaterial)
if (tfcProperty != null) {
const outputMaterial = (tfcProperty.getOutputMaterial() == null) ? material : tfcProperty.getOutputMaterial()
// 1. Префикс ассоциируемый с текущим предметом.
// 2. Проперти ТФК с нагревом металла и другими полезными проперти.
// 3. Материал из которого состоит объект.
@@ -1601,9 +1610,6 @@ const registerTFCRecipes = (e) => {
processCrushedOre(TagPrefix.crushed, tfcProperty, material, outputMaterial)
processCrushedPurifiedOre(TagPrefix.crushedPurified, tfcProperty, material, outputMaterial)
processCrushedRefinedOre(TagPrefix.crushedRefined, tfcProperty, material, outputMaterial)
processRichRawOre(TFGTagPrefix.richRawOre, tfcProperty, material, outputMaterial)
processNormalRawore(TagPrefix.rawOre, tfcProperty, material, outputMaterial)
processPoorRawOre(TFGTagPrefix.poorRawOre, tfcProperty, material, outputMaterial)
// 1. Тип инструмента
// 2. Префикс ассоциируемый с текущим предметом.
@@ -3395,7 +3401,7 @@ const registerTFCRecipes = (e) => {
.id('tfg:smelting/fireclay_brick')
// Выпаривание соли
e.recipes.tfc.pot([], Fluid.of('tfc:salt_water', 625), 300, 1000)
e.recipes.tfc.pot([], Fluid.of('tfc:salt_water', 1000), 300, 250)
.itemOutput('gtceu:small_salt_dust')
.id('tfg:tfc/pot/salt')
@@ -3634,9 +3640,30 @@ const registerTFCRecipes = (e) => {
//#endregion
//#region Каолинитовая глина
e.shapeless('tfc:kaolin_clay', [
'minecraft:clay_ball',
'gtceu:aluminium_dust',
['gtceu:fullers_earth_dust', 'gtceu:silicon_dust', 'gtceu:silicon_dioxide_dust'],
['minecraft:bone_meal', 'gtceu:calcium_dust'],
['tfg:shale_dust', 'tfg:claystone_dust', 'tfg:limestone_dust', 'tfg:conglomerate_dust', 'tfg:dolomite_dust', 'tfg:chert_dust', 'tfg:chalk_dust']
]).id('tfg:tfc/kaolinite_clay')
//#endregion
//#region Каолинитовая глина -> Порошок каолинита
e.recipes.createMilling('2x tfc:powder/kaolinite', 'tfc:kaolin_clay')
.id(`tfg:milling/tfc/kaolinite_powder`)
e.recipes.gtceu.macerator('tfg:tfc/kaolinite_powder')
.itemInputs('tfc:kaolin_clay')
.itemOutputs('2x tfc:powder/kaolinite')
.EUt(2).duration(40)
//#endregion
//Fire bricks
e.recipes.gtceu.compressor('fire_bricks')
.itemInputs('4x tfc:ceramic/fire_brick')
.itemInputs()
.itemOutputs('2x tfc:fire_bricks')
.duration(800)
.EUt(2)

8
kubejs/server_scripts/tfc/tags.js
View File

@@ -313,7 +313,13 @@ const registerTFCBlockTags = (event) => {
event.add('tfc:glass_basin_blocks', 'tfc:white_kaolin_clay')
event.add('tfc:glass_pouring_table', 'tfc:white_kaolin_clay')
//#endregion
//#region Позволяем ТФК магме греть бойлер из Create
global.TFC_MAGMA_BLOCKS.forEach(el => {
event.add('create:passive_boiler_heaters', el)
})
//#endregion
//#region Удаление тегов и скрытие руд
const ALL_TFC_ORES = Ingredient.of(/tfc:ore\/[^*]+\/[^*]+/).itemIds

35
kubejs/startup_scripts/minecraft/constants.js
View File

@@ -535,23 +535,23 @@ global.MINECRAFT_DISABLED_ITEMS = [
//#endregion
//#region Шаблоны брони
'minecraft:wayfinder_armor_trim_smithing_template',
'minecraft:netherite_upgrade_smithing_template',
'minecraft:dune_armor_trim_smithing_template',
'minecraft:snout_armor_trim_smithing_template',
'minecraft:shaper_armor_trim_smithing_template',
'minecraft:coast_armor_trim_smithing_template',
'minecraft:vex_armor_trim_smithing_template',
'minecraft:host_armor_trim_smithing_template',
'minecraft:rib_armor_trim_smithing_template',
'minecraft:silence_armor_trim_smithing_template',
'minecraft:spire_armor_trim_smithing_template',
'minecraft:tide_armor_trim_smithing_template',
'minecraft:eye_armor_trim_smithing_template',
'minecraft:raiser_armor_trim_smithing_template',
'minecraft:wild_armor_trim_smithing_template',
'minecraft:sentry_armor_trim_smithing_template',
'minecraft:ward_armor_trim_smithing_template',
// 'minecraft:wayfinder_armor_trim_smithing_template',
// 'minecraft:netherite_upgrade_smithing_template',
// 'minecraft:dune_armor_trim_smithing_template',
// 'minecraft:snout_armor_trim_smithing_template',
// 'minecraft:shaper_armor_trim_smithing_template',
// 'minecraft:coast_armor_trim_smithing_template',
// 'minecraft:vex_armor_trim_smithing_template',
// 'minecraft:host_armor_trim_smithing_template',
// 'minecraft:rib_armor_trim_smithing_template',
// 'minecraft:silence_armor_trim_smithing_template',
// 'minecraft:spire_armor_trim_smithing_template',
// 'minecraft:tide_armor_trim_smithing_template',
// 'minecraft:eye_armor_trim_smithing_template',
// 'minecraft:raiser_armor_trim_smithing_template',
// 'minecraft:wild_armor_trim_smithing_template',
// 'minecraft:sentry_armor_trim_smithing_template',
// 'minecraft:ward_armor_trim_smithing_template',
//#endregion
//#region Свечи
@@ -748,7 +748,6 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:shears',
'minecraft:lantern',
'minecraft:soul_lantern',
'minecraft:smithing_table',
'minecraft:smoker',
'minecraft:blast_furnace',
'minecraft:chiseled_bookshelf',

9
kubejs/startup_scripts/tfc/constants.js
View File

@@ -1247,3 +1247,12 @@ global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS = [
{ input: 'tfc:plant/cranberry_bush', fluid_amount: 6000, output: '3x tfc:food/cranberry', name: 'cranberry' },
];
global.TFC_MAGMA_BLOCKS = [
'tfc:rock/magma/granite',
'tfc:rock/magma/diorite',
'tfc:rock/magma/gabbro',
'tfc:rock/magma/rhyolite',
'tfc:rock/magma/basalt',
'tfc:rock/magma/andesite',
'tfc:rock/magma/dacite'
];

2
mods

Submodule mods updated: 011bb3ccee...0d2374f19c