From 4d801d9c96f456f9122296e2ace20070d3906943 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Thu, 21 Aug 2025 04:42:07 -0400 Subject: [PATCH 01/52] Disable energy p2p (#1661) * github being github * First bandage fix for removing FE P2P --- config/ae2/common.json | 2 +- .../tfg/blockstates/large_nest_box.json | 278 +++++++++--------- .../blockstates/large_nest_box_warped.json | 278 +++++++++--------- .../assets/tfg/models/item/sniffer_egg.json | 10 +- .../loot_tables/entities/conductor.json | 8 +- kubejs/server_scripts/ae2/recipes.js | 2 + kubejs/server_scripts/ae2/tags.js | 2 + kubejs/startup_scripts/ae2/constants.js | 1 + 8 files changed, 293 insertions(+), 288 deletions(-) diff --git a/config/ae2/common.json b/config/ae2/common.json index 6f089b803..2c91128bd 100644 --- a/config/ae2/common.json +++ b/config/ae2/common.json @@ -76,7 +76,7 @@ "CrystalResonanceGeneratorRate_comment": "How much energy a crystal resonance generator generates per tick.", "CrystalResonanceGeneratorRate": 20.0, "p2pTunnelEnergyTax_comment": "The cost to transport energy through an energy P2P tunnel expressed as a factor of the transported energy.", - "p2pTunnelEnergyTax": 0.025, + "p2pTunnelEnergyTax": 0.999, "p2pTunnelTransportTax_comment": "The cost to transport items/fluids/etc. through P2P tunnels, expressed in AE energy per equivalent I/O bus operation for the transported object type (i.e. items\u003dper 1 item, fluids\u003dper 125mb).", "p2pTunnelTransportTax": 0.025 }, diff --git a/kubejs/assets/tfg/blockstates/large_nest_box.json b/kubejs/assets/tfg/blockstates/large_nest_box.json index 93f899574..810bfd65f 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json index 89e95bf8a..5b7e00742 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/sniffer_egg.json b/kubejs/assets/tfg/models/item/sniffer_egg.json index 4ff54261b..ee27e4927 100644 --- a/kubejs/assets/tfg/models/item/sniffer_egg.json +++ b/kubejs/assets/tfg/models/item/sniffer_egg.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "minecraft:item/sniffer_egg" - } +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/sniffer_egg" + } } \ No newline at end of file diff --git a/kubejs/data/railways/loot_tables/entities/conductor.json b/kubejs/data/railways/loot_tables/entities/conductor.json index 1f3b78b18..6fe9965c2 100644 --- a/kubejs/data/railways/loot_tables/entities/conductor.json +++ b/kubejs/data/railways/loot_tables/entities/conductor.json @@ -1,5 +1,5 @@ -{ - "type": "minecraft:entity", - "pools": [], - "random_sequence": "railways:entities/conductor" +{ + "type": "minecraft:entity", + "pools": [], + "random_sequence": "railways:entities/conductor" } \ No newline at end of file diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 7198628da..2e7b72e49 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -17,6 +17,8 @@ const registerAE2Recipes = (event) => { ], mod: 'ae2' }); + event.remove( { output: 'ae2:fe_p2p_tunnel' } ) + // Cutting knives (for renaming things) event.shaped('ae2:certus_quartz_cutting_knife', [ ' A', diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index 316431166..30ad88670 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -10,6 +10,8 @@ const registerAE2ItemTags = (event) => { event.remove('forge:storage_blocks', 'ae2:quartz_block') event.remove('forge:storage_blocks/certus_quartz', 'ae2:quartz_block') + + event.removeAll('ae2:p2p_attunements/fe_p2p_tunnel') event.add('tfg:certus_quartz_blocks', 'gtceu:certus_quartz_block') event.add('tfg:certus_quartz_blocks', 'ae2:quartz_block') diff --git a/kubejs/startup_scripts/ae2/constants.js b/kubejs/startup_scripts/ae2/constants.js index 9496276a9..88e39d121 100644 --- a/kubejs/startup_scripts/ae2/constants.js +++ b/kubejs/startup_scripts/ae2/constants.js @@ -25,6 +25,7 @@ global.AE2_DISABLED_ITEMS = [ 'ae2:charged_staff', 'ae2:name_press', 'ae2:charger', + 'ae2:fe_p2p_tunnel', // Блоки 'ae2:vibration_chamber', From 08011735a11fc315286d240439b9f59cc27853dd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:01:02 +0100 Subject: [PATCH 02/52] whitespace? github tweakin again --- .../tfg/blockstates/large_nest_box.json | 278 +++++++++--------- .../blockstates/large_nest_box_warped.json | 278 +++++++++--------- .../assets/tfg/models/item/sniffer_egg.json | 10 +- 3 files changed, 283 insertions(+), 283 deletions(-) diff --git a/kubejs/assets/tfg/blockstates/large_nest_box.json b/kubejs/assets/tfg/blockstates/large_nest_box.json index 93f899574..8fcac03c3 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json index 89e95bf8a..b5894ba69 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/sniffer_egg.json b/kubejs/assets/tfg/models/item/sniffer_egg.json index 4ff54261b..ee27e4927 100644 --- a/kubejs/assets/tfg/models/item/sniffer_egg.json +++ b/kubejs/assets/tfg/models/item/sniffer_egg.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "minecraft:item/sniffer_egg" - } +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/sniffer_egg" + } } \ No newline at end of file From a2a30eb84b3a6dafcdbef7522c1ecff6ac0c60c7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:06:38 +0100 Subject: [PATCH 03/52] sterling silver alloy smelter --- CHANGELOG.md | 2 +- kubejs/server_scripts/tfc/recipes.metals.js | 30 ++++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a57a3c42c..ea8eb76c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,13 +18,13 @@ - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop - Fixed duplicate mixer recipes for rose gold and sterling silver @Pyritie +- Added missing rose gold + sterling silver alloy smelter recipes (#1664) @Redeix - Fixed mechanical mixers requiring an alloy that needed that tier of mixer @Pyritie - Finally fixed all the issues with upgrading the toolbelt - now you can safely dye and undye, upgrade with and without tools inside it, etc (#368) @Pyritie - Fixed a dupe with certus quartz @Pyritie - Moved the golden apple recipe over to the food processor so it respects food expiry data @Pyritie - Removed some remaining swine-steel crafting recipes @Pyritie - Added missing hoe/scythe mineable tags from custom crops (#1622) @Pyritie -- Added missing rose gold alloy smelter recipes (#1664) @Redeix - Fixed some (but not all) model issues with the reflector block (#1664) @Redeix ## [0.10.9] - 10-08-2025 diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index ec358a554..a1026e886 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -116,49 +116,49 @@ function registerTFCMetalsRecipes(event) { event.recipes.gtceu.forge_hammer('tfg/refined_bloom') .itemInputs('tfc:raw_iron_bloom') .itemOutputs('tfc:refined_iron_bloom') - .duration(400) + .duration(200) .EUt(4) // Укрепленная крица -> Слиток кованного железа event.recipes.gtceu.forge_hammer('tfg/wrought_iron_ingot') .itemInputs('tfc:refined_iron_bloom') .itemOutputs('gtceu:wrought_iron_ingot') - .duration(400) + .duration(200) .EUt(4) // Чугун -> Высокоуглеродная сталь event.recipes.gtceu.forge_hammer('tfg/high_carbon_steel') .itemInputs('tfc:metal/ingot/pig_iron') .itemOutputs('tfc:metal/ingot/high_carbon_steel') - .duration(500) + .duration(300) .EUt(4) // Высокоуглеродная сталь -> Cталь event.recipes.gtceu.forge_hammer('tfg/steel') .itemInputs('tfc:metal/ingot/high_carbon_steel') .itemOutputs('gtceu:steel_ingot') - .duration(500) + .duration(300) .EUt(4) // Высокоуглеродная черная сталь -> черная сталь event.recipes.gtceu.forge_hammer('tfg/black_steel') .itemInputs('tfc:metal/ingot/high_carbon_black_steel') .itemOutputs('tfc:metal/ingot/black_steel') - .duration(600) + .duration(300) .EUt(4) // Высокоуглеродная синяя сталь -> синяя сталь event.recipes.gtceu.forge_hammer('tfg/blue_steel') .itemInputs('tfc:metal/ingot/high_carbon_blue_steel') .itemOutputs('tfc:metal/ingot/blue_steel') - .duration(700) + .duration(400) .EUt(4) // Высокоуглеродная красная сталь -> красная сталь event.recipes.gtceu.forge_hammer('tfg/red_steel') .itemInputs('tfc:metal/ingot/high_carbon_red_steel') .itemOutputs('tfc:metal/ingot/red_steel') - .duration(700) + .duration(400) .EUt(4) // Слабая сталь + Чугун -> Высокоуглеродная черная сталь @@ -200,7 +200,7 @@ function registerTFCMetalsRecipes(event) { .duration(700) .EUt(4) - // Rose Gold + // Rose Gold + Sterling Silver const copper_types = [ "#forge:ingots/copper", "#forge:dusts/copper", @@ -211,6 +211,10 @@ function registerTFCMetalsRecipes(event) { "#forge:ingots/gold", "#forge:dusts/gold" ]; + const silver_types = [ + "#forge:ingots/silver", + "#forge:dusts/silver" + ]; copper_types.forEach(copper_types_array => { gold_types.forEach(gold_types_array => { @@ -219,9 +223,17 @@ function registerTFCMetalsRecipes(event) { .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RoseGold, 5)) .duration(20*10) .EUt(GTValues.VA[GTValues.LV]) - }) + }); + silver_types.forEach(silver_types_array => { + event.recipes.gtceu.alloy_smelter(`sterling_silver_from_${copper_types_array.replace(/:/g, "/").replace(/#/g, "")}_and_${silver_types_array.replace(/:/g, "/").replace(/#/g, "")}`) + .itemInputs(Ingredient.of(copper_types_array).withCount(1), Ingredient.of(silver_types_array).withCount(4)) + .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.SterlingSilver, 5)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.LV]) + }); }); + const TFC_INTERMEDIATE_METALS = [ { metal: 'pig_iron', meltTemp: 1535 }, From dbed48eedf0e765205c64aecdcd00d2aa9b0092c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:13:49 +0100 Subject: [PATCH 04/52] update CL --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea8eb76c3..7c65fc7cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ - Refactored locometal recipes to use stonecutters, metal plated locometal is now also much cheaper (#1624) @Pyritie - Increased the air capacity of space suits by 250% @Pyritie - Converted custom tooltips to lang strings for translations (#1663) @Redeix +- Removed energy P2P (#1661) @TomPlop @BlueBoat29 +- Fixed grammar on death messages and added some new ones (#1642) @vdegans ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop @@ -26,6 +28,8 @@ - Removed some remaining swine-steel crafting recipes @Pyritie - Added missing hoe/scythe mineable tags from custom crops (#1622) @Pyritie - Fixed some (but not all) model issues with the reflector block (#1664) @Redeix +- Fixed food processor outputs not stacking @gustovafing +- Fixed using the grappling hook on a ladder killing you (#106) @Zippity ## [0.10.9] - 10-08-2025 ### Changes From 4395da4c2b4d4e30bebdf95e81c5ea04f81af2d1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:15:07 +0100 Subject: [PATCH 05/52] fix #1639 Related Work Items: #1 --- kubejs/server_scripts/gregtech/recipes.tfcmetals.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js index 18afc77a1..ee1ecd260 100644 --- a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js +++ b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js @@ -43,7 +43,6 @@ function registerGTCEuTFCMetalsRecipes(event) { event.remove({ id: 'gtceu:electric_blast_furnace/blast_black_bronze' }) event.remove({ id: 'gtceu:electric_blast_furnace/blast_black_bronze_gas' }) event.remove({ id: 'gtceu:vacuum_freezer/cool_hot_black_bronze_ingot' }) - event.remove({ id: 'gtceu:vacuum_freezer/black_bronze' }) event.remove({ id: 'gtceu:electric_blast_furnace/blast_sterling_silver' }) event.remove({ id: 'gtceu:electric_blast_furnace/blast_sterling_silver_gas' }) event.remove({ id: 'gtceu:electric_blast_furnace/blast_rose_gold' }) From d5fe25fccc4d9cf4436c2120777f483885267c5f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:41:31 +0100 Subject: [PATCH 06/52] why is ender chest still enabled --- config/ftbqoptimizer.snbt | 13 ------------- defaultconfigs/ftbessentials-server.snbt | 2 +- defaultconfigs/ftbessentials.snbt | 2 +- defaultconfigs/ftbqoptimizer.snbt | 3 --- 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 config/ftbqoptimizer.snbt delete mode 100644 defaultconfigs/ftbqoptimizer.snbt diff --git a/config/ftbqoptimizer.snbt b/config/ftbqoptimizer.snbt deleted file mode 100644 index a62cf278c..000000000 --- a/config/ftbqoptimizer.snbt +++ /dev/null @@ -1,13 +0,0 @@ -# FTBQuestOptimizer config file -# If you're a modpack maker, edit defaultconfigs/ftbqoptimizer-server.snbt instead - -{ - # Enable optimization of quest completion detection - # Default: true - detect_optimization: true - - # Number of tick skips for checking player inventories, 0 to disable tick skipping. Experiment and find the best value for you! - # Default: 5 - # Range: 0 ~ 100 - skip_ticks_amount: 5 -} diff --git a/defaultconfigs/ftbessentials-server.snbt b/defaultconfigs/ftbessentials-server.snbt index c3f5803c5..9faf16ec7 100644 --- a/defaultconfigs/ftbessentials-server.snbt +++ b/defaultconfigs/ftbessentials-server.snbt @@ -49,7 +49,7 @@ # Allows users to access their ender chest, as well as admins to manage other players' ender chests. enderchest: { # Default: true - enabled: true + enabled: false } # Allows users to set a custom hat as their head item by using a command diff --git a/defaultconfigs/ftbessentials.snbt b/defaultconfigs/ftbessentials.snbt index 888367213..570c0568e 100644 --- a/defaultconfigs/ftbessentials.snbt +++ b/defaultconfigs/ftbessentials.snbt @@ -40,7 +40,7 @@ # Allows users to access their ender chest, as well as admins to manage other players' ender chests. enderchest: { # Default: true - enabled: true + enabled: false } # Allows users to set a custom hat as their head item by using a command diff --git a/defaultconfigs/ftbqoptimizer.snbt b/defaultconfigs/ftbqoptimizer.snbt deleted file mode 100644 index b5327ff6a..000000000 --- a/defaultconfigs/ftbqoptimizer.snbt +++ /dev/null @@ -1,3 +0,0 @@ -# Default config file that will be copied to instance's config/ftbqoptimizer.snbt location - -{ } From b623efc8942d83c673475e1890cf1b9b0383652e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Nieto?= Date: Thu, 21 Aug 2025 22:28:30 +0200 Subject: [PATCH 07/52] fix: Fixed quests.metal_age.red_blu to not be stuck when migrating worlds (#1667) --- config/ftbquests/quests/chapters/questsmetallurgy.snbt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index af71cddaf..fd604ce90 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -630,11 +630,9 @@ id: "5792DDAA82895E67" subtitle: "{quests.metal_age.red_blu.subtitle}" tasks: [{ - dimension: "minecraft:overworld" - icon: "gtceu:overworld_marker" - id: "720D64916D1E3892" - title: "{quests.stone_age.temperature.task}" - type: "dimension" + id: "63890641DCD6659F" + title: "{quests.tasktype.checkmark}" + type: "checkmark" }] title: "{quests.metal_age.red_blu.title}" x: 24.0d From ac8f873373027a46c3eb1b3501634779b995a9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Nieto?= Date: Thu, 21 Aug 2025 22:29:59 +0200 Subject: [PATCH 08/52] fix: Fixed quests.metal_age.redblu_anvil having both steel requirements instead of one (#1666) Co-authored-by: Redeix --- config/ftbquests/quests/chapters/questsmetallurgy.snbt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index fd604ce90..ae7f936e9 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -659,6 +659,7 @@ "5088768AAA28FCBA" "6D04BAC5B215F90F" ] + dependency_requirement: "one_completed" description: ["{quests.metal_age.redblu_anvil.desc}"] id: "56CA2EB7812529C5" shape: "octagon" From 5e85474cf1765bd17050656556c5a2c9e2e4b57c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 21:37:46 +0100 Subject: [PATCH 09/52] fix #1652 --- kubejs/server_scripts/gregtech/recipes.removes.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 21f0b09f3..895467739 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -653,6 +653,8 @@ function removeGTCEURecipes(event) { removeMaceratorRecipe(event, 'macerate_treated_wood_boat') removeMaceratorRecipe(event, 'macerate_treated_wood_chest_boat') + removeMaceratorRecipe(event, 'macerate_marble') + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__fireclay' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__ender_eye' }) From 0804d81d6c4ead45c80eec8f47878da81c300bd8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 21:39:31 +0100 Subject: [PATCH 10/52] fix #1659 --- kubejs/server_scripts/firmalife/recipes.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 97b87ad98..c8bfe83ef 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -581,14 +581,14 @@ const registerFirmaLifeRecipes = (event) => { 'firmalife:mixing_bowl' ]).id(`tfg:shapeless/${grain}_dough_3`) - event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`4x tfc:food/${grain}_dough`).copyFood(), [ + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`2x tfc:food/${grain}_dough`).copyFood(), [ 'firmalife:spoon', TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), TFC.ingredient.fluid(TFC.fluidStackIngredient('minecraft:water', 100)), 'firmalife:mixing_bowl' ]).id(`tfg:shapeless/${grain}_flatbread_dough`) - event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`8x tfc:food/${grain}_dough`).copyFood(), [ + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`4x tfc:food/${grain}_dough`).copyFood(), [ 'firmalife:spoon', TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), @@ -596,7 +596,7 @@ const registerFirmaLifeRecipes = (event) => { 'firmalife:mixing_bowl' ]).id(`tfg:shapeless/${grain}_flatbread_dough_2`) - event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`12x tfc:food/${grain}_dough`).copyFood(), [ + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`6x tfc:food/${grain}_dough`).copyFood(), [ 'firmalife:spoon', TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), @@ -605,7 +605,7 @@ const registerFirmaLifeRecipes = (event) => { 'firmalife:mixing_bowl' ]).id(`tfg:shapeless/${grain}_flatbread_dough_3`) - event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`16x tfc:food/${grain}_dough`).copyFood(), [ + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`8x tfc:food/${grain}_dough`).copyFood(), [ 'firmalife:spoon', TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), From b192a347a9c9d1e07177d09987e4771970b61c72 Mon Sep 17 00:00:00 2001 From: Bogdan <57633804+bogdan-nikitin@users.noreply.github.com> Date: Thu, 21 Aug 2025 23:59:49 +0300 Subject: [PATCH 11/52] Fix link in README (#1668) Signed-off-by: Bogdan <57633804+bogdan-nikitin@users.noreply.github.com> --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index efbbc238d..ec88c111d 100644 --- a/.github/README.md +++ b/.github/README.md @@ -56,7 +56,7 @@ This modpack is still a work in progress, and is constantly being updated. In it Interested in contributing? For detailed setup instructions, coding standards, and guidelines, please read [this](CONTRIBUTING.md). -Want to help translate? Please read [this](../kubejs/README%20IF%20TRANSLATING.md) instead. +Want to help translate? Please read [this](../kubejs/README_IF_TRANSLATING.md) instead. --- From c60849185794409c4c36b6c5a78a5d071d141081 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 22:19:55 +0100 Subject: [PATCH 12/52] added some more food recipes for #1638, fixed the wrong chocolate in #1632 --- CHANGELOG.md | 1 + kubejs/server_scripts/firmalife/recipes.js | 7 ++ kubejs/server_scripts/tfg/recipes.food.js | 96 ++++++++++++++++++- kubejs/startup_scripts/firmalife/constants.js | 4 +- 4 files changed, 106 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c65fc7cd..422287bb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - Fixed some (but not all) model issues with the reflector block (#1664) @Redeix - Fixed food processor outputs not stacking @gustovafing - Fixed using the grappling hook on a ladder killing you (#106) @Zippity +- Added more missing food processor recipes (#1632, #1638) @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index c8bfe83ef..2249bac00 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -743,4 +743,11 @@ const registerFirmaLifeRecipes = (event) => { Fluid.of('afc:birch_syrup', 1000)) .outputItem('createaddition:honey_cake') .id('tfg:mixing_bowl/birch_honey_cake') + + event.remove({ id: 'firmalife:mixing_bowl/chocolate_ice_cream' }) + event.recipes.firmalife.mixing_bowl() + .ingredients([TFC.ingredient.notRotten('firmalife:food/vanilla_ice_cream')], + Fluid.of('tfcchannelcasting:milk_chocolate', 100)) + .outputItem(TFC.isp.of('firmalife:food/chocolate_ice_cream').copyFood()) + .id('tfg:mixing_bowl/chocolate_ice_cream') } diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 660257cda..a99006432 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -545,8 +545,17 @@ function registerTFGFoodRecipes(event) { itemOutputs: ["firmalife:food/tortilla_chips"], itemOutputProvider: TFC.isp.of("firmalife:food/tortilla_chips").copyFood() }) + + processorRecipe("tomato_sauce", 300, 8, { + circuit: 1, + itemInputs: ['tfc:food/tomato', 'tfc:powder/salt', 'tfc:food/garlic'], + fluidInputs: ['tfg:clean_water 200'], + itemOutputs: ['5x firmalife:food/tomato_sauce'], + itemOutputProvider: TFC.isp.of('5x firmalife:food/tomato_sauce').copyOldestFood() + }) processorRecipe("tomato_sauce_mix", 600, 8, { + circuit: 2, itemInputs: ['tfc:food/tomato', 'tfc:powder/salt', 'tfc:food/garlic'], itemOutputs: ['5x firmalife:food/tomato_sauce_mix'], itemOutputProvider: TFC.isp.of('5x firmalife:food/tomato_sauce_mix').copyOldestFood(), @@ -597,6 +606,7 @@ function registerTFGFoodRecipes(event) { fluidOutputs: [Fluid.of('tfc:vinegar', 250)], }) + // Pizza processorRecipe("pizza_no_extra", 600, 16, { itemInputs: ["firmalife:food/pizza_dough", "firmalife:food/tomato_sauce", "firmalife:food/shredded_cheese"], itemOutputs: ["firmalife:food/raw_pizza"], @@ -633,6 +643,20 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of("4x firmalife:food/pizza_dough").copyOldestFood() }) + processorRecipe("shredded_cheese", 100, 16, { + itemInputs: ['#firmalife:foods/cheeses'], + itemOutputs: ['4x firmalife:food/shredded_cheese'], + circuit: 30, + itemOutputProvider: TFC.isp.of('firmalife:food/shredded_cheese').copyFood() + }) + + processorRecipe("basil", 20, 16, { + itemInputs: ['firmalife:plant/basil'], + itemOutputs: ['2x firmalife:spice/basil_leaves'], + circuit: 30 + }) + + // Ice cream processorRecipe("vanilla_ice_cream", 300, 16, { itemInputs: ['firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla'], itemOutputs: ['2x firmalife:food/vanilla_ice_cream'], @@ -643,7 +667,7 @@ function registerTFGFoodRecipes(event) { processorRecipe("chocolate_ice_cream", 300, 16, { itemInputs: ['firmalife:food/vanilla_ice_cream'], itemOutputs: ['firmalife:food/chocolate_ice_cream'], - fluidInputs: [Fluid.of('firmalife:chocolate', 1000)], + fluidInputs: [Fluid.of('tfcchannelcasting:milk_chocolate', 100)], itemOutputProvider: TFC.isp.of("firmalife:food/chocolate_ice_cream").resetFood() }) @@ -659,6 +683,13 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of("firmalife:food/cookie_dough_ice_cream").resetFood() }) + processorRecipe("banana_split", 500, 16, { + itemInputs: ['firmalife:food/vanilla_ice_cream', 'firmalife:food/strawberry_ice_cream', 'firmalife:food/chocolate_ice_cream', 'firmalife:food/pineapple', 'tfc:food/cherry', '2x tfc:food/banana'], + itemOutputs: ['2x firmalife:food/banana_split'], + itemOutputProvider: TFC.isp.of('2x firmalife:food/banana_split').resetFood(), + circuit: 4 + }) + processorRecipe("butter", 300, 16, { itemInputs: ["tfc:powder/salt"], fluidInputs: [Fluid.of('firmalife:cream', 1000)], @@ -755,6 +786,62 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('firmalife:food/soy_mixture').copyOldestFood() }) + processorRecipe("brown_mushroom", 100, 8, { + circuit: 30, + itemInputs: ["minecraft:brown_mushroom_block"], + itemOutputs: ["4x minecraft:brown_mushroom"], + itemOutputProvider: TFC.isp.of("4x minecraft:brown_mushroom").resetFood() + }) + + processorRecipe("red_mushroom", 100, 8, { + circuit: 30, + itemInputs: ["minecraft:red_mushroom_block"], + itemOutputs: ["4x minecraft:red_mushroom"], + itemOutputProvider: TFC.isp.of("4x minecraft:red_mushroom").resetFood() + }) + + processorRecipe("cut_pumpkin", 100, 8, { + circuit: 30, + itemInputs: ["tfc:pumpkin"], + itemOutputs: ["4x tfc:food/pumpkin_chunks"], + itemOutputProvider: TFC.isp.of("4x tfc:food/pumpkin_chunks").copyOldestFood() + }) + + processorRecipe("cut_melon", 100, 8, { + circuit: 30, + itemInputs: ["tfc:melon"], + itemOutputs: ["4x tfc:food/melon_slice"], + itemOutputProvider: TFC.isp.of("4x tfc:food/melon_slice").copyOldestFood() + }) + + processorRecipe("salsa", 300, 8, { + circuit: 1, + itemInputs: ['tfc:food/tomato', 'tfc:powder/salt', 'firmalife:plant/cilantro'], + itemOutputs: ['5x firmalife:food/salsa'], + itemOutputProvider: TFC.isp.of('5x firmalife:food/salsa').copyOldestFood() + }) + + processorRecipe("bacon", 300, 8, { + circuit: 1, + itemInputs: [/*TFC.ingredient.hasTrait(*/'tfc:food/pork'/*, 'firmalife:smoked')*/, 'tfc:powder/salt'], + itemOutputs: ['4x firmalife:food/bacon'], + itemOutputProvider: TFC.isp.of('4x firmalife:food/bacon').copyOldestFood() + }) + + processorRecipe("picked_egg", 1000, 8, { + circuit: 1, + itemInputs: ['minecraft:clay_ball', 'tfc:powder/wood_ash', 'tfc:powder/salt', 'tfc:food/boiled_egg'], + itemOutputs: ['firmalife:food/pickled_egg'], + itemOutputProvider: TFC.isp.of('firmalife:food/pickled_egg').copyOldestFood() + }) + + processorRecipe("garlic_bread", 300, 8, { + circuit: 1, + itemInputs: ['firmalife:food/toast', 'firmalife:food/butter', 'tfc:food/garlic'], + itemOutputs: ['firmalife:food/garlic_bread'], + itemOutputProvider: TFC.isp.of('firmalife:food/garlic_bread').copyOldestFood() + }) + // Alcohols global.TFC_ALCOHOL.forEach(alcohol => { @@ -964,6 +1051,13 @@ function registerTFGFoodRecipes(event) { [TFC.ingredient.notRotten('betterend:cave_pumpkin'), '#tfc:knives'], 'betterend:cave_pumpkin') .id(`tfg:crafting/cave_pumpkin_chunks_knife`) + processorRecipe("cut_cave_pumpkin", 100, 8, { + circuit: 30, + itemInputs: ["betterend:cave_pumpkin"], + itemOutputs: ["4x betterend:cave_pumpkin_chunks"], + itemOutputProvider: TFC.isp.of("4x betterend:cave_pumpkin_chunks").copyOldestFood() + }) + processorRecipe("cave_pumpkin_pie_dough", 300, GTValues.VA[GTValues.HV], { itemInputs: ['#tfg:martian_eggs', '2x betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'], fluidInputs: ['minecraft:water 1000'], diff --git a/kubejs/startup_scripts/firmalife/constants.js b/kubejs/startup_scripts/firmalife/constants.js index 5253ef8d1..83747ad96 100644 --- a/kubejs/startup_scripts/firmalife/constants.js +++ b/kubejs/startup_scripts/firmalife/constants.js @@ -33,7 +33,9 @@ global.FIRMALIFE_DISABLED_ITEMS = [ 'firmalife:irrigation_tank', // disabled so people use tongs instead - 'firmalife:peel' + 'firmalife:peel', + + 'firmalife:bucket/chocolate' ]; global.FIRMALIFE_HIDED_ITEMS = [ From cdd8213bedc128ce1be297389235415e6823df86 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 22:29:55 +0100 Subject: [PATCH 13/52] langs --- kubejs/assets/beneath/lang/uk_ua.json | 2 + kubejs/assets/betterend/lang/uk_ua.json | 30 +++-- kubejs/assets/create/lang/uk_ua.json | 12 +- kubejs/assets/createdeco/lang/uk_ua.json | 1 + kubejs/assets/firmalife/lang/uk_ua.json | 2 +- kubejs/assets/gtceu/lang/en_us.json | 2 + kubejs/assets/gtceu/lang/uk_ua.json | 7 +- kubejs/assets/minecraft/lang/uk_ua.json | 15 ++- kubejs/assets/tfc/lang/en_us.json | 133 ++++++++++++----------- kubejs/assets/tfc/lang/uk_ua.json | 10 +- kubejs/assets/tfg/lang/en_us.json | 69 ++++++------ kubejs/assets/tfg/lang/uk_ua.json | 131 +++++++++++++++------- 12 files changed, 242 insertions(+), 172 deletions(-) diff --git a/kubejs/assets/beneath/lang/uk_ua.json b/kubejs/assets/beneath/lang/uk_ua.json index b7c4cbe1e..142ace301 100644 --- a/kubejs/assets/beneath/lang/uk_ua.json +++ b/kubejs/assets/beneath/lang/uk_ua.json @@ -10,7 +10,9 @@ "block.beneath.crackrack": "Кератофір", "block.beneath.soul_clay": "Брудна Глина", "block.beneath.wood.fallen_leaves.crimson": "Занепала червона ламела", + "block.beneath.wood.leaves.crimson": "Багряна пластинка", "block.beneath.wood.fallen_leaves.warped": "Занепала викривлена ламела", + "block.beneath.wood.leaves.warped": "Покручена пластинка", "item.beneath.cursed_hide": "Лавостійка Шкіра", "item.beneath.blackstone_brick": "Цегла з Піроксеніту", "item.beneath.cursecoal": "Антрацит", diff --git a/kubejs/assets/betterend/lang/uk_ua.json b/kubejs/assets/betterend/lang/uk_ua.json index de416474c..d3c47af1c 100644 --- a/kubejs/assets/betterend/lang/uk_ua.json +++ b/kubejs/assets/betterend/lang/uk_ua.json @@ -72,21 +72,17 @@ "block.betterend.umbrella_moss": "Парасолькоподібний мох", "block.betterend.umbrella_moss_tall": "Парасолькоподібний мох", "block.betterend.vaiolush_fern": "Папороть Вайолаш", - "item.betterend.amber_root_product": "Бурштинові паростки", - "item.betterend.amber_root_seeds": "Насіння бурштинових пагонів", - "item.betterend.blossom_berry_product": "Цвіт ягод", - "item.betterend.blossom_berry_seeds": "Цвітіння насінини ягоди", - "item.betterend.bolux_mushroom_cooked": "Приготований гриб Болукс", - "item.betterend.bolux_mushroom_product": "Гриб Болукс", - "item.betterend.bolux_mushroom_seeds": "Спори гриба Болукс", - "item.betterend.cave_pumpkin_chunks": "Шматки Балбкіна", - "item.betterend.cave_pumpkin_product": "Балбкін", - "item.betterend.cave_pumpkin_plant_seeds": "Насіння Балбкіна", - "item.betterend.cave_pumpkin_pie": "Пиріг із Балбкіна", - "item.betterend.chorus_mushroom_cooked": "Приготований гриб Чалмі", - "item.betterend.chorus_mushroom_product": "Гриб Чалмі", - "item.betterend.chorus_mushroom_seeds": "Спори гриба Чалмі", - "item.betterend.shadow_berry_cooked": "Приготована ягода Нокс", - "item.betterend.shadow_berry_product": "Нокс ягода", - "item.betterend.shadow_berry_seeds": "Насіння нокс ягоди" + "item.create.netherite_diving_helmet.tooltip.summary": "Разом з _Blue Steel Backtank_, це може захистити вас від _extreme heat_. Щоб бути ефективними, _Legs and Feet_ повинні бути вкриті _Blue Steel Diving Equipment_, також.", + "item.create.netherite_backtank": "Бактанк із Синьої Сталі", + "item.create.netherite_diving_helmet": "Шолом для Дайвінгу із Синьої Сталі", + "item.create.netherite_diving_boots": "Черевики для Дайвінгу із Синьої Сталі", + "item.create.copper_sheet": "Мідна пластина", + "item.create.brass_sheet": "Латунна пластина", + "item.create.golden_sheet": "Золотий лист", + "item.create.crushed_raw_gold": "Очищена Золота Руда", + "item.create.crushed_raw_copper": "Очищена Мідна Руда", + "item.create.crushed_raw_zinc": "Очищена Цинкова Руда", + "item.create.crushed_raw_silver": "Очищена Срібна Руда", + "item.create.crushed_raw_tin": "Очищена Олов'яна Руда", + "item.create.crushed_raw_lead": "Очищена Свинцева Руда" } \ No newline at end of file diff --git a/kubejs/assets/create/lang/uk_ua.json b/kubejs/assets/create/lang/uk_ua.json index 62ef6ace1..591f2768a 100644 --- a/kubejs/assets/create/lang/uk_ua.json +++ b/kubejs/assets/create/lang/uk_ua.json @@ -91,10 +91,10 @@ "item.create.crushed_raw_tin": "Очищена Олов'яна Руда", "item.create.crushed_raw_lead": "Очищена Свинцева Руда", "create.ponder.andesite_tunnel.header": "Використання металевих тунелів", - "create.ponder.andesite_tunnel.text_1": "Металеві тунелі можна використовувати для приховування твоїх конвеєрних стрічок.", - "create.ponder.andesite_tunnel.text_2": "Коли металевий тунель має з'єднання з боків...", - "create.ponder.belt_casing.text_1": "Латунний або металевий корпус можна використовувати для декорування механічних ременів.", - "create.ponder.brass_funnel.text_1": "Металеві лійки можуть витягувати лише одиничні предмети.", - "create.ponder.cogwheel_casing.text_1": "Латунний або металевий корпус можна використовувати для декорування зубчастих коліс.", - "create.ponder.shaft_casing.text_1": "Латунний або металевий корпус можна використовувати для декорування валів." + "create.ponder.andesite_tunnel.text_1": "Металеві тунелі можна використовувати для приховування ременів", + "create.ponder.andesite_tunnel.text_2": "Якщо металевий тунель має з'єднання з боковими сторонами...", + "create.ponder.belt_casing.text_1": "Латунний або металевий кожух можна використовувати для декорування механічних ременів", + "create.ponder.brass_funnel.text_1": "Металеві воронки можуть витягувати лише окремі предмети.", + "create.ponder.cogwheel_casing.text_1": "Латунний або металевий кожух можна використовувати для декорування зубчастих коліс", + "create.ponder.shaft_casing.text_1": "Для оздоблення валів можна використовувати латунний або металевий кожух" } \ No newline at end of file diff --git a/kubejs/assets/createdeco/lang/uk_ua.json b/kubejs/assets/createdeco/lang/uk_ua.json index a6c767a13..2c95eeeca 100644 --- a/kubejs/assets/createdeco/lang/uk_ua.json +++ b/kubejs/assets/createdeco/lang/uk_ua.json @@ -63,6 +63,7 @@ "block.createdeco.locked_industrial_iron_door": "Зачинені Сталеві Двері", "block.createdeco.industrial_iron_trapdoor": "Сталевий Лаз", "block.createdeco.industrial_iron_ladder": "Сталева Драбина", + "block.createdeco.industrial_iron_facade": "Сталевий фасад", "item.createdeco.iron_coin": "Монета з Кованого Заліза", "item.createdeco.netherite_coin": "Монета з Синьої Сталі", "item.createdeco.industrial_iron_coin": "Монета зі Сталі", diff --git a/kubejs/assets/firmalife/lang/uk_ua.json b/kubejs/assets/firmalife/lang/uk_ua.json index b1c0bd510..b4c8b5a2c 100644 --- a/kubejs/assets/firmalife/lang/uk_ua.json +++ b/kubejs/assets/firmalife/lang/uk_ua.json @@ -18,5 +18,5 @@ "block.firmalife.treated_wood_greenhouse_door": "Двері теплиці з обробленої воском деревини", "block.firmalife.treated_wood": "Оброблена воском деревина", "greenhouse.firmalife.treated_wood": "Оброблена воском деревина", - "item.firmalife.treated_lumber": "Оброблена Воском Деревина" + "item.firmalife.treated_lumber": "Оброблені воском пиломатеріали" } \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index e0d487eea..cee31871e 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -87,6 +87,8 @@ "item.gtceu.treated_wood_plate": "Treated Medium Density Fiberboard", "item.gtceu.wood_plate": "Medium Density Fiberboard", "item.gtceu.treated_wood_dust": "Treated Chipboard Composite", + "item.gtceu.small_treated_wood_dust": "Small Pile of Treated Chipboard Composite", + "item.gtceu.tiny_treated_wood_dust": "Tiny Pile of Treated Chipboard Composite", "material.gtceu.ice": "Ice Slush", "material.gtceu.damascus_steel": "Swine-steel", "material.gtceu.cooperite": "Cooperite", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index c98584ff7..4dda465b9 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -95,6 +95,7 @@ "material.gtceu.ostrum": "Острум", "material.gtceu.calorite": "Калорит", "material.gtceu.etrium": "Етріум", + "material.gtceu.aluminium_silicate": "Алюмосилікат", "material.gtceu.rocket_alloy_t1": "Алюміносталевий ракетний сплав R-класу", "material.gtceu.rocket_alloy_t3": "Ракетний сплав вольфрамової сталі 45-Ti", "material.gtceu.vitrified_asbestos": "Вітрифікований азбест", @@ -154,14 +155,14 @@ "tagprefix.pickaxe_head": "%s Лезо кайла", "tagprefix.shovel_head": "%s Лезо лопати", "tagprefix.axe_head": "%s Лезо сокири", - "tagprefix.hoe_head": "%s Лезо мотики", + "tagprefix.hoe_head": "%s Оголів'я мотики", "tagprefix.scythe_head": "%s Лезо коси", - "tagprefix.file_head": "%s Лезо напилка", + "tagprefix.file_head": "%s Оголів'я напилка", "tagprefix.hammer_head": "%s Оголів'я молота", "tagprefix.saw_head": "%s Лезо пили", "tagprefix.knife_head": "%s Лезо ножа", "tagprefix.butchery_knife_head": "%s Лезо тесака", - "tagprefix.mining_hammer_head": "%s Лезо скельного молота", + "tagprefix.mining_hammer_head": "%s Оголів'я скельного молота", "tagprefix.spade_head": "%s Лезо лопати", "tagprefix.double_ingot": "%s Подвійний злиток", "tagprefix.poor_raw": "Бідна(е, ий) сира(е, ий) %s", diff --git a/kubejs/assets/minecraft/lang/uk_ua.json b/kubejs/assets/minecraft/lang/uk_ua.json index d7f7df16d..cbc46730e 100644 --- a/kubejs/assets/minecraft/lang/uk_ua.json +++ b/kubejs/assets/minecraft/lang/uk_ua.json @@ -45,7 +45,20 @@ "block.minecraft.pearlescent_froglight": "Перламутровий Світлобутон", "block.minecraft.verdant_froglight": "Зеленіючий Світлобутон", "block.minecraft.ochre_froglight": "Охристий Світлобутон", - "minecraft:nether_wart_block": "Блок багрового наросту", + "block.minecraft.nether_wart_block": "Блок багрового бородавника", + "block.minecraft.weeping_vines_plant": "Багряна виноградна лоза", + "block.minecraft.weeping_vines": "Багряні лози", + "block.minecraft.red_sand": "Гематитний пісок", + "block.minecraft.red_sandstone": "Гематитний пісковик", + "block.minecraft.red_sandstone_stairs": "Гематитні пісковикові сходи", + "block.minecraft.red_sandstone_slab": "Гематитна пісковикова плита", + "block.minecraft.red_sandstone_wall": "Гематитна пісковикова стіна", + "block.minecraft.chiseled_red_sandstone": "Різьблений гематитний пісковик", + "block.minecraft.smooth_red_sandstone": "Гладкий гематитний пісковик", + "block.minecraft.smooth_red_sandstone_stairs": "Гладкі гематитні пісковикові сходи", + "block.minecraft.smooth_red_sandstone_slab": "Гладка гематитна пісковикова плита", + "block.minecraft.cut_red_sandstone": "Різаний гематитний пісковик", + "block.minecraft.cut_red_sandstone_slab": "Різана гематитна пісковикова плита", "item.minecraft.iron_nugget": "Самородок чавуну", "item.minecraft.iron_ingot": "Чавунний злиток", "item.minecraft.iron_block": "Чавунний блок", diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 61aab90fe..265eef153 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,67 +1,70 @@ { - "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.tfc.fluid.salt_water": "Sea Water", - "block.tfc.cauldron.salt_water": "Sea Water Cauldron", - "fluid.tfc.salt_water": "Sea Water", - "item.tfc.bucket.salt_water": "Sea Water Bucket", - "item.tfc.powder.saltpeter": "Saltpeter Powder", - "item.tfc.powder.sulfur": "Sulfur Powder", - "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", - "metal.tfg.redstone": "Redstone", - "metal.tfg.red_alloy": "Red Alloy", - "metal.tfg.tin_alloy": "Tin Alloy", - "metal.tfg.lead": "Lead", - "metal.tfg.invar": "Invar", - "metal.tfg.potin": "Potin", - "metal.tfg.cobalt": "Cobalt", - "metal.tfg.cobalt_brass": "Cobalt Brass", - "metal.tfg.aluminium_silicate": "Aluminium Silicate", - "trim_material.tfc.almandine_tfc": "Almandine", - "trim_material.tfc.andradite_tfc": "Andradite", - "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", - "trim_material.tfc.cinnabar_tfc": "Cinnabar", - "trim_material.tfc.coal_tfc": "Coal", - "trim_material.tfc.diamond_tfc": "Diamond", - "trim_material.tfc.emerald_tfc": "Emerald", - "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", - "trim_material.tfc.grossular_tfc": "Grossular", - "trim_material.tfc.rutile_tfc": "Rutile", - "trim_material.tfc.lazurite_tfc": "Lazurite", - "trim_material.tfc.pyrope_tfc": "Pyrope", - "trim_material.tfc.rock_salt_tfc": "Rock Salt", - "trim_material.tfc.ruby_tfc": "Ruby", - "trim_material.tfc.salt_tfc": "salt", - "trim_material.tfc.sapphire_tfc": "Sapphire", - "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", - "trim_material.tfc.spessartine_tfc": "Spessartine", - "trim_material.tfc.topaz_tfc": "Topaz", - "trim_material.tfc.uvarovite_tfc": "Uvarovite", - "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", - "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", - "trim_material.tfc.quartzite_tfc": "Quartzite", - "trim_material.tfc.realgar_tfc": "Realgar", - "trim_material.tfc.malachite_tfc": "Malachite", - "trim_material.tfc.glass_tfc": "Glass", - "trim_material.tfc.olivine_tfc": "Olivine", - "trim_material.tfc.opal_tfc": "Opal", - "trim_material.tfc.amethyst_tfc": "Amethyst", - "trim_material.tfc.lapis_tfc": "Lapis", - "trim_material.tfc.apatite_tfc": "Apatite", - "trim_material.tfc.red_garnet_tfc": "Red Garnet", - "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", - "trim_material.tfc.monazite_tfc": "Monazite", - "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", - "trim_material.tfc.fluix_tfc": "Fluix", - "trim_material.tfc.silver_tfc": "Silver", - "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", - "trim_material.tfc.gold_tfc": "Gold", - "trim_material.tfc.rose_gold_tfc": "Rose Gold", - "trim_material.tfc.nickel_tfc": "Nickel", - "trim_material.tfc.platinum_tfc": "Platinum", - "trim_material.tfc.titanium_tfc": "Titanium", - "trim_material.tfc.bismuth_tfc": "Bismuth", - "trim_material.tfc.neutronium_tfc": "Neutronium", - "trim_material.tfc.pyrite_tfc": "Pyrite", - "trim_material.tfc.redx_tfc": "RedX" + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfc.fluid.salt_water": "Sea Water", + "block.tfc.cauldron.salt_water": "Sea Water Cauldron", + "fluid.tfc.salt_water": "Sea Water", + "block.fluid.tfc.salt_water": "Sea Water", + "fluid.tfc.river_water": "River Water", + "block.fluid.tfc.river_water": "River Water", + "item.tfc.bucket.salt_water": "Sea Water Bucket", + "item.tfc.powder.saltpeter": "Saltpeter Powder", + "item.tfc.powder.sulfur": "Sulfur Powder", + "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", + "metal.tfg.redstone": "Redstone", + "metal.tfg.red_alloy": "Red Alloy", + "metal.tfg.tin_alloy": "Tin Alloy", + "metal.tfg.lead": "Lead", + "metal.tfg.invar": "Invar", + "metal.tfg.potin": "Potin", + "metal.tfg.cobalt": "Cobalt", + "metal.tfg.cobalt_brass": "Cobalt Brass", + "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "trim_material.tfc.almandine_tfc": "Almandine", + "trim_material.tfc.andradite_tfc": "Andradite", + "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", + "trim_material.tfc.cinnabar_tfc": "Cinnabar", + "trim_material.tfc.coal_tfc": "Coal", + "trim_material.tfc.diamond_tfc": "Diamond", + "trim_material.tfc.emerald_tfc": "Emerald", + "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", + "trim_material.tfc.grossular_tfc": "Grossular", + "trim_material.tfc.rutile_tfc": "Rutile", + "trim_material.tfc.lazurite_tfc": "Lazurite", + "trim_material.tfc.pyrope_tfc": "Pyrope", + "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.ruby_tfc": "Ruby", + "trim_material.tfc.salt_tfc": "salt", + "trim_material.tfc.sapphire_tfc": "Sapphire", + "trim_material.tfc.sodalite_tfc": "Sodalite", + "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.spessartine_tfc": "Spessartine", + "trim_material.tfc.topaz_tfc": "Topaz", + "trim_material.tfc.uvarovite_tfc": "Uvarovite", + "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", + "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", + "trim_material.tfc.quartzite_tfc": "Quartzite", + "trim_material.tfc.realgar_tfc": "Realgar", + "trim_material.tfc.malachite_tfc": "Malachite", + "trim_material.tfc.glass_tfc": "Glass", + "trim_material.tfc.olivine_tfc": "Olivine", + "trim_material.tfc.opal_tfc": "Opal", + "trim_material.tfc.amethyst_tfc": "Amethyst", + "trim_material.tfc.lapis_tfc": "Lapis", + "trim_material.tfc.apatite_tfc": "Apatite", + "trim_material.tfc.red_garnet_tfc": "Red Garnet", + "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", + "trim_material.tfc.monazite_tfc": "Monazite", + "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", + "trim_material.tfc.fluix_tfc": "Fluix", + "trim_material.tfc.silver_tfc": "Silver", + "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", + "trim_material.tfc.gold_tfc": "Gold", + "trim_material.tfc.rose_gold_tfc": "Rose Gold", + "trim_material.tfc.nickel_tfc": "Nickel", + "trim_material.tfc.platinum_tfc": "Platinum", + "trim_material.tfc.titanium_tfc": "Titanium", + "trim_material.tfc.bismuth_tfc": "Bismuth", + "trim_material.tfc.neutronium_tfc": "Neutronium", + "trim_material.tfc.pyrite_tfc": "Pyrite", + "trim_material.tfc.redx_tfc": "RedX" } \ No newline at end of file diff --git a/kubejs/assets/tfc/lang/uk_ua.json b/kubejs/assets/tfc/lang/uk_ua.json index d2cbb659b..dede5e361 100644 --- a/kubejs/assets/tfc/lang/uk_ua.json +++ b/kubejs/assets/tfc/lang/uk_ua.json @@ -12,6 +12,10 @@ "metal.tfg.tin_alloy": "Олов'яний сплав", "metal.tfg.lead": "Свинець", "metal.tfg.invar": "Інвар", + "metal.tfg.potin": "Потин", + "metal.tfg.cobalt": "Кобальт", + "metal.tfg.cobalt_brass": "Кобальтова латунь", + "metal.tfg.aluminium_silicate": "Алюмосилікат", "trim_material.tfc.almandine_tfc": "Альмандин", "trim_material.tfc.andradite_tfc": "Андрадіт", "trim_material.tfc.blue_topaz_tfc": "Синій Топаз", @@ -22,7 +26,7 @@ "trim_material.tfc.green_sapphire_tfc": "Зелений Сапфір", "trim_material.tfc.grossular_tfc": "Гроссуляр", "trim_material.tfc.rutile_tfc": "Рутил", - "trim_material.tfc.lazurite_tfc": "Лазурите", + "trim_material.tfc.lazurite_tfc": "Лазурит", "trim_material.tfc.pyrope_tfc": "Піроп", "trim_material.tfc.rock_salt_tfc": "Кам'яна Сіль", "trim_material.tfc.ruby_tfc": "Рубін", @@ -33,7 +37,7 @@ "trim_material.tfc.spessartine_tfc": "Спесартин", "trim_material.tfc.topaz_tfc": "Топаз", "trim_material.tfc.uvarovite_tfc": "Уваровіт", - "trim_material.tfc.nether_quartz_tfc": "Кварц Нижнього Світу", + "trim_material.tfc.nether_quartz_tfc": "Незерський кварц", "trim_material.tfc.certus_quartz_tfc": "Істинний кварц", "trim_material.tfc.quartzite_tfc": "Кварцит", "trim_material.tfc.realgar_tfc": "Реальгар", @@ -42,7 +46,7 @@ "trim_material.tfc.olivine_tfc": "Олівін", "trim_material.tfc.opal_tfc": "Опал", "trim_material.tfc.amethyst_tfc": "Аметист", - "trim_material.tfc.lapis_tfc": "Лазурит", + "trim_material.tfc.lapis_tfc": "Лапіс", "trim_material.tfc.apatite_tfc": "Апатит", "trim_material.tfc.red_garnet_tfc": "Червоний Гранат", "trim_material.tfc.yellow_garnet_tfc": "Жовтий Гранат", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 8670c0a70..f88883ad9 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -222,6 +222,7 @@ "block.tfg.grass.amber_mycelium": "Amber Mycelium", "block.tfg.grass.rusticus_mycelium": "Rusticus Mycelium", "block.tfg.grass.sangnum_mycelium": "Sangnum Mycelium", + "block.tfg.sapling.glacian": "Glacian Mushroom", "block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator", "block.tfg.superconductor_coil_large": "Large Superconductor Coil", "block.tfg.superconductor_coil_small": "Small Superconductor Coil", @@ -744,40 +745,6 @@ "tfg.tooltip.food_trait.refrigerating": "§bRefrigerating", "tfg.tooltip.foodtrait.freeze_dried": "Cryodesiccated", "tfg.tooltip.extraterrestrial_farming": "§4Temperature:§r An oxygenated environment provides 15°C", - "tfg.tooltip.nametag": "§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.", - "tfg.tooltip.yeast_starter": "§7Created with dried fruit", - "tfg.tooltip.beehive": "§7Needs to be filled with empty frames and surrounded by flowers to attract bees.", - "tfg.tooltip.obsolete.tree_tap": "§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!", - "tfg.tooltip.obsolete.fridge": "§4Obsolete§f: Replaced by the TFG Refrigerator, you can craft it from this one by placing this in a crafting table!", - "tfg.tooltip.blaze_burner": "§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.", - "tfg.tooltip.machine.perfect_overclock": "This machine has §2Perfect Overclocking§r!", - "tfg.tooltip.nether_dome_1": "§7Artificial enviroment to simulate the Nether.", - "tfg.tooltip.machine.customize_interior": "§7The interior is customizable! Check the multiblock preview in JEI.", - "tfg.tooltip.end_dome_1": "§7Artificial enviroment to simulate the End.", - "tfg.tooltip.armor.copper_diving_suit_warmth": "§7Warmth: -1", - "tfg.tooltip.armor.copper_diving_suit_insulation": "§7Insulation: +1", - "tfg.tooltip.armor.netherite_diving_suit_warmth": "§7Warmth: -2", - "tfg.tooltip.armor.netherite_diving_suit_insulation": "§7Insulation: +9", - "tfg.tooltip.armor.netherite_diving_suit_set": "§7Wear the full set to be §eHeatproof§7 from ambient temperatures.", - "tfg.tooltip.armor.nanomuscle_warmth": "§7Warmth: 0", - "tfg.tooltip.armor.nanomuscle_insulation": "§7Insulation: +10", - "tfg.tooltip.armor.nanomuscle_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", - "tfg.tooltip.armor.quarktech_warmth": "§7Warmth: 0", - "tfg.tooltip.armor.quarktech_insulation": "§7Insulation: +10", - "tfg.tooltip.armor.quarktech_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", - "tfg.tooltip.armor.space_suit_warmth": "§7Warmth: 0", - "tfg.tooltip.armor.space_suit_insulation": "§7Insulation: +10", - "tfg.tooltip.armor.space_suit_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", - "tfg.tooltip.support.tier1": "§79 x 5 x 9", - "tfg.tooltip.support.tier2": "§717 x 9 x 17", - "tfg.tooltip.support.tier3": "§733 x 13 x 33", - "tfg.tooltip.vessels": "§cMax: 3024mB", - "tfg.tooltip.solar_panel.single": "Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r", - "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", - "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", - "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", - "tfg.tooltip.petrified_egg": "§7Requires Magma to Incubate", - "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", "entity.tfg.moon_rabbit.male": "Moon Rabbit", "entity.tfg.moon_rabbit.female": "Moon Rabbit", "tfg.tooltip.moon_rabbit_variant.pink": "Pink Fur", @@ -931,6 +898,40 @@ "tooltip.tfg.ore_prospector_mode_vein": "per-vein", "tooltip.tfg.ore_prospector_mode_block": "per-block", "tfg.hangglider.disabled_dimension": "You can't use a hang glider here!", + "tfg.tooltip.nametag": "§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.", + "tfg.tooltip.yeast_starter": "§7Created with dried fruit", + "tfg.tooltip.beehive": "§7Needs to be filled with empty frames and surrounded by flowers to attract bees.", + "tfg.tooltip.obsolete.tree_tap": "§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!", + "tfg.tooltip.obsolete.fridge": "§4Obsolete§f: Replaced by the TFG Refrigerator, you can craft it from this one by placing this in a crafting table!", + "tfg.tooltip.blaze_burner": "§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.", + "tfg.tooltip.machine.perfect_overclock": "This machine has §2Perfect Overclocking§r!", + "tfg.tooltip.nether_dome_1": "§7Artificial enviroment to simulate the Nether.", + "tfg.tooltip.machine.customize_interior": "§7The interior is customizable! Check the multiblock preview in JEI.", + "tfg.tooltip.end_dome_1": "§7Artificial enviroment to simulate the End.", + "tfg.tooltip.armor.copper_diving_suit_warmth": "§7Warmth: -1", + "tfg.tooltip.armor.copper_diving_suit_insulation": "§7Insulation: +1", + "tfg.tooltip.armor.netherite_diving_suit_warmth": "§7Warmth: -2", + "tfg.tooltip.armor.netherite_diving_suit_insulation": "§7Insulation: +9", + "tfg.tooltip.armor.netherite_diving_suit_set": "§7Wear the full set to be §eHeatproof§7 from ambient temperatures.", + "tfg.tooltip.armor.nanomuscle_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.nanomuscle_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.nanomuscle_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.quarktech_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.quarktech_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.quarktech_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.space_suit_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.space_suit_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.space_suit_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.support.tier1": "§79 x 5 x 9", + "tfg.tooltip.support.tier2": "§717 x 9 x 17", + "tfg.tooltip.support.tier3": "§733 x 13 x 33", + "tfg.tooltip.vessels": "§cMax: 3024mB", + "tfg.tooltip.solar_panel.single": "Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.petrified_egg": "§7Requires Magma to Incubate", + "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", "tfc.jei.flint_knapping": "Flint Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "Dyeing", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 1938dd42d..932f5c4a4 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -218,6 +218,7 @@ "block.tfg.ev_gas_pressurizer": "§bПокращений газовий пресуризатор III§r", "block.tfg.semiheavy_ammoniacal_water": "Термохімічно збагачена амоніачна напівважка вода", "block.tfg.grass.mars_dirt": "Марсіанський ґрунт", + "block.tfg.grass.mars_farmland": "Марсіанське поле", "block.tfg.grass.amber_mycelium": "Бурштиновий міцелій", "block.tfg.grass.rusticus_mycelium": "Міцелій Rusticus", "block.tfg.grass.sangnum_mycelium": "Сангнумний міцелій", @@ -248,12 +249,13 @@ "block.tfg.zpm_railgun_item_loader_out": "§cZPM Міжпланетний рейкотронний вихідний модуль§r", "block.tfg.uv_railgun_item_loader_out": "§3UV Міжпланетний рейкотронний вихідний модуль§r", "block.tfg.uhv_railgun_item_loader_out": "§4UHV Міжпланетний рейкотронний вихідний модуль§r", - "block.tfg.sunflower": "Cоняшник", + "block.tfg.reflector": "Відбивний блок", + "block.tfg.sunflower": "Соняшник", "block.tfg.sunflower_wild": "Дикий соняшник", "block.tfg.sunflower_dead": "Мертвий соняшник", - "block.tfg.rapeseed": "Pіпак", - "block.tfg.rapeseed_wild": "Дикий ріпак", - "block.tfg.rapeseed_dead": "Мертвий ріпак", + "block.tfg.rapeseed": "Канола", + "block.tfg.rapeseed_wild": "Дика канола", + "block.tfg.rapeseed_dead": "Мертва канола", "block.tfg.casings.machine_casing_iron_desh": "Обшивка машини з дешу", "block.tfg.casings.machine_casing_stainless_evaporation": "Корпус випарної машини з нержавіючої сталі", "block.tfg.casings.machine_casing_blue_solar_panel": "Корпус базової сонячної панелі", @@ -380,7 +382,6 @@ "item.tfg.soaked_hardwood_strip": "Просочена Смуга Твердого Дерева", "item.tfg.prepared_leather_gloves": "Підготовлені Шкіряні Рукавички", "item.tfg.latex_soaked_gloves": "Латексно-Просякнуті Рукавички", - "item.tfg.spade_head_extruder_mold": "Форма екструдера (лезо лопати)", "item.tfg.unfired_chalk": "Необпалена Крейдяна Паличка", "item.tfg.armor_stand_arms": "Стійка для Броні з Руками", "item.tfg.flint_club_head": "Кам’яне оголів'я булави", @@ -474,9 +475,18 @@ "item.tfg.food.freeze_dried.melon_slice": "Сублімований скибочка дині", "item.tfg.food.freeze_dried.fig": "Сублімований інжир", "item.tfg.food.freeze_dried.pineapple": "Сублімований ананас", + "item.tfg.food.freeze_dried.blossom_berry": "Цвітіння сублімованої ягоди", + "item.tfg.food.freeze_dried.shadow_berry": "Сублімована ягода нокс", + "item.tfg.food.freeze_dried.cave_pumpkin": "Сублімовані шматки бульбкіна", "item.tfg.food.calorie_paste": "Калорійна паста", "item.tfg.food.meal_bag": "Сумка для їжі", "item.tfg.food.ice_soup": "Крижаний суп", + "item.tfg.food.raw_glacian_mutton": "Сире гляціанське бараняче м’ясо", + "item.tfg.food.cooked_glacian_mutton": "Смажене гляціанське бараняче м’ясо", + "item.tfg.spawn_egg.glacian_ram": "Яйце ghbpjde Гляціанця", + "item.tfg.food.raw_sniffer_beef": "Сире м’ясо нюхача", + "item.tfg.food.cooked_sniffer_beef": "Смажене м’ясо нюхача", + "item.tfg.spawn_egg.sniffer": "Яйце призову Нюхача", "item.tfg.roasted_sunflower_seeds": "Смажене насіння соняшника", "item.tfg.sunflower_seeds": "Насіння соняшника", "item.tfg.sunflower_product": "Соняшнткова Кепка", @@ -520,7 +530,9 @@ "item.tfg.wood.lumber.aeronos": "Деревина Аеронос", "item.tfg.wood.lumber.strophar": "Деревина Строфар", "item.tfg.wood.lumber.glacian": "Деревина Глаціан", - "item.tfg.aes_polyurethane": "Армована R-поліуретанова піна AES", + "item.tfg.glacian_wool": "Шерсть гляціанського барана", + "item.tfg.sniffer_wool": "Мінералонасичені пучки", + "item.tfg.aes_polyurethane": "Біо-АЕС армована R-поліуретанова піна", "item.tfg.mli_shielding": "Багатошарове ізольоване екранування", "item.tfg.rocket_cone_t3": "Високотехнологічний носовий обтічник ракети", "item.tfg.rocket_fin_t3": "Високотехнологічне ракетне оперення", @@ -530,6 +542,7 @@ "item.tfg.universal_compost_browns": "Коричневий універсальний компост", "item.tfg.universal_compost_greens": "Зелений універсальний компост", "item.tfg.etching_diamond_tip": "Гравіювальний алмазний наконечник", + "item.tfg.spade_head_extruder_mold": "Форма екструдера (лезо лопати)", "item.tfg.mining_hammer_head_extruder_mold": "Форма екструдера (оголів'я шахтного молота)", "item.tfg.sword_head_extruder_mold": "Форма екструдера (лезо меча)", "item.tfg.pickaxe_head_extruder_mold": "Форма екструдера (лезо кирки)", @@ -555,6 +568,8 @@ "item.tfg.small_casing_extruder_mold": "Форма екструдера (гільза малого калібру)", "item.tfg.shell_casing_extruder_mold": "Форма екструдера (гільза для снаряда)", "item.tfg.large_casing_extruder_mold": "Форма екструдера (гільза великого калібру)", + "item.tfg.photo_cell_t1": "Базова фотоелементна капсула", + "item.tfg.electric_extendo_grip": "Електричне подовжене руків’я", "material.tfg.latex": "Латекс", "material.tfg.vulcanized_latex": "Вулканізований Латекс", "material.tfg.fluix": "Флюс", @@ -627,13 +642,13 @@ "ore_vein.tfg.deep_pitchblende": "Ураніт & Пітчбленд", "ore_vein.tfg.deep_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.deep_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.deep_sheldonite": "Шелдоніт і Борніт", + "ore_vein.tfg.deep_sheldonite": "Куперит і Борніт", "ore_vein.tfg.deep_topaz": "Топаз і Халькоцит", "ore_vein.tfg.normal_apatite": "Апатит і Пірохлор", "ore_vein.tfg.normal_basaltic_sands": "Мінеральні піски", "ore_vein.tfg.normal_beryllium": "Смарагд і Берилій", - "ore_vein.tfg.normal_bismuthinite": "Вісмут (Звичайний)", - "ore_vein.tfg.normal_cassiterite": "Каситерит (Звичайний)", + "ore_vein.tfg.normal_bismuthinite": "Бісмут (Звичайний)", + "ore_vein.tfg.normal_cassiterite": "Каситерит (звичайний)", "ore_vein.tfg.normal_coal": "Вугілля", "ore_vein.tfg.normal_copper": "Мідь та Халькопірит", "ore_vein.tfg.normal_garnet_tin": "Гранат і Каситеритові піски", @@ -643,7 +658,7 @@ "ore_vein.tfg.normal_hematite": "Гематит та Лімоніт", "ore_vein.tfg.normal_lapis": "Лапіс, Лазурит та Содаліт", "ore_vein.tfg.normal_limonite": "Лімоніт", - "ore_vein.tfg.normal_lubricant": "Стеатит, Тальк і Трона", + "ore_vein.tfg.normal_lubricant": "Соапостон, Тальк і Трона", "ore_vein.tfg.normal_magnetite": "Магнетит і Ванадій", "ore_vein.tfg.normal_manganese": "Марганець і Тантал", "ore_vein.tfg.normal_mica": "Кіаніт, Слюда та Боксити", @@ -659,30 +674,30 @@ "ore_vein.tfg.normal_spodumene": "Сподумен та Лепідоліт", "ore_vein.tfg.normal_sulfur": "Сірка та Пірит", "ore_vein.tfg.normal_tetrahedrite": "Тетраедрит (Звичайний)", - "ore_vein.tfg.surface_bismuthinite": "Вісмут (Поверхня)", - "ore_vein.tfg.surface_cassiterite": "Каситерит (Поверхнивий)", + "ore_vein.tfg.surface_bismuthinite": "Вісмут (Поверхневий)", + "ore_vein.tfg.surface_cassiterite": "Каситерит (Поверхневий)", "ore_vein.tfg.surface_copper": "Халькопірит та Реальгар", "ore_vein.tfg.surface_sphalerite": "Сфалерит і Сірка", - "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхня)", + "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхневий)", "ore_vein.tfg.moon_apatite": "Апатит і Пірохлор", "ore_vein.tfg.moon_bauxite": "Боксит і Ільменіт", "ore_vein.tfg.moon_beryllium": "Смарагд і Берилій", "ore_vein.tfg.moon_desh": "Деш і Ільменіт", "ore_vein.tfg.moon_garnierite": "Гарнієрит і Кобальтит", "ore_vein.tfg.moon_graphite": "Графіт і Діамант", - "ore_vein.tfg.moon_lubricant": "Стеатит, Тальк і Трона", + "ore_vein.tfg.moon_lubricant": "Соапостон, Тальк і Трона", "ore_vein.tfg.moon_magnetite": "Хроміт і Магнетит", "ore_vein.tfg.moon_manganese": "Марганець і Тантал", "ore_vein.tfg.moon_mica": "Кіаніт, Слюда та Боксити", "ore_vein.tfg.moon_molybdenum": "Вульфеніт і Молібденіт", "ore_vein.tfg.moon_monazite": "Бастнезит і Монацит", "ore_vein.tfg.moon_pyrolusite": "Піролюзит і Кобальт", - "ore_vein.tfg.moon_quartz": "Істинний Кварц", + "ore_vein.tfg.moon_quartz": "Істинний кварц", "ore_vein.tfg.moon_redstone": "Редстоун, Кіновар і Рубін", "ore_vein.tfg.moon_saltpeter": "Селітра та Електротин", "ore_vein.tfg.moon_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.moon_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.moon_sheldonite": "Шелдоніт і Борніт", + "ore_vein.tfg.moon_sheldonite": "Куперит і Борніт", "ore_vein.tfg.moon_silver": "Срібло, Гален і Свинець", "ore_vein.tfg.moon_sphalerite": "Сфалерит і Пірит", "ore_vein.tfg.moon_topaz": "Топаз і Халькоцит", @@ -690,31 +705,31 @@ "ore_vein.tfg.nether_apatite": "Апатит і Пірохлор", "ore_vein.tfg.nether_basaltic_sands": "Мінеральні піски", "ore_vein.tfg.nether_beryllium": "Смарагд і Берилій", - "ore_vein.tfg.nether_cassiterite": "Каситерит", + "ore_vein.tfg.nether_cassiterite": "Касетерит", "ore_vein.tfg.nether_copper": "Мідь та Халькопірит", "ore_vein.tfg.nether_garnet": "Аметист, Опал і Гранат", "ore_vein.tfg.nether_garnet_tin": "Гранат і Каситеритові піски", "ore_vein.tfg.nether_garnierite": "Гарнієрит і Кобальтит", "ore_vein.tfg.nether_goethite": "Гетит", - "ore_vein.tfg.nether_gold": "Золото та Гематит", + "ore_vein.tfg.nether_gold": "Золото і Гематит", "ore_vein.tfg.nether_graphite": "Графіт і Діамант", "ore_vein.tfg.nether_hematite": "Гематит та Лімоніт", "ore_vein.tfg.nether_lapis": "Лапіс, Лазурит та Содаліт", - "ore_vein.tfg.nether_lubricant": "Стеатит, Тальк і Трона", + "ore_vein.tfg.nether_lubricant": "Соапостон, Тальк і Трона", "ore_vein.tfg.nether_magnetite": "Хроміт", "ore_vein.tfg.nether_manganese": "Марганець і Тантал", "ore_vein.tfg.nether_mica": "Кіаніт, Слюда та Боксити", "ore_vein.tfg.nether_molybdenum": "Вульфеніт і Молібденіт", "ore_vein.tfg.nether_monazite": "Бастнезит і Монацит", - "ore_vein.tfg.nether_naquadah": "Наквадак і Плутоній", + "ore_vein.tfg.nether_naquadah": "Наквада і Плутоній", "ore_vein.tfg.nether_olivine": "Бентоніт та Олівін", "ore_vein.tfg.nether_pitchblende": "Ураніт & Пітчбленд", - "ore_vein.tfg.nether_quartz": "Кварц Нижнього Світу", + "ore_vein.tfg.nether_quartz": "Незерський кварц", "ore_vein.tfg.nether_redstone": "Редстоун, Кіновар і Рубін", "ore_vein.tfg.nether_saltpeter": "Селітра та Електротин", "ore_vein.tfg.nether_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.nether_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.nether_sheldonite": "Шелдоніт і Борніт", + "ore_vein.tfg.nether_sheldonite": "Куперит і Борніт", "ore_vein.tfg.nether_silver": "Срібло, Гален і Свинець", "ore_vein.tfg.nether_sphalerite": "Сфалерит і Пірит", "ore_vein.tfg.nether_sulfur": "Сірка та Пірит", @@ -734,6 +749,12 @@ "tfg.tooltip.moon_rabbit_variant.cyan": "Хутро кольору морської піни", "tfg.tooltip.moon_rabbit_variant.purple": "Лавандове хутро", "tfg.tooltip.moon_rabbit_variant.sofu": "Пломбірне хутро", + "entity.tfg.glacian_ram.male": "Glacian Ram", + "entity.tfg.glacian_ram.female": "Glacian Ewe", + "tfg.tooltip.attribution.glacian_ram": "§9§oCredit: Ad Astra", + "entity.tfg.sniffer.male": "Sniffer", + "entity.tfg.sniffer.female": "Sniffer", + "tfg.tooltip.attribution.sniffer": "§9§oCredit: Minecraft", "item.treetap.tap": "Застарілий предмет, створіть для оновлення", "item.gtceu.zinc_ingot": "Застарілий предмет, створіть для оновлення", "item.gtceu.brass_ingot": "Застарілий предмет, створіть для оновлення", @@ -857,6 +878,22 @@ "trim_material.tfc.neutronium_tfc": "Нейтроній", "trim_material.tfc.pyrite_tfc": "Пірит", "trim_material.tfc.redx_tfc": "RedX", + "tfg.emi.ore_veins.rock_types": "Зустрічається в типах порід:", + "tfg.emi.ore_veins.rarity": "Рідкість: %d", + "tfg.emi.ore_veins.density": "Щільність: %d", + "tfg.emi.ore_veins.y_ranges": "Глибина: %d до %d", + "tfg.emi.ore_veins.size": "Розмір: %d", + "tfg.emi.ore_veins.height": "Висота: %d", + "tfg.emi.ore_veins.radius": "Радіус: %d", + "emi.category.tfg.ore_vein_info": "Жили руди", + "tfg.toast.ore_prospector_none": "У межах діапазону руд не знайдено.", + "tfg.toast.ore_prospector_message": "Руди, знайдені в межах %s §6блоків у цьому напрямку: %s", + "tooltip.tfg.ore_prospector_stats": "Діапазон сканування: %s, Поперечний переріз: %s x %s.", + "tooltip.tfg.ore_prospector_count": "Цей розвідник зображатиме кількість руди.", + "tooltip.tfg.ore_prospector_xray": "Цей розвідник відображатиме %s рентгенівський огляд блоків руди.", + "tooltip.tfg.ore_prospector_mode_vein": "per-vein", + "tooltip.tfg.ore_prospector_mode_block": "per-block", + "tfg.hangglider.disabled_dimension": "Тут не можна використовувати дельтаплан!", "tfc.jei.flint_knapping": "Обробка Кременю", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Фарбування", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "Фарбування", @@ -915,7 +952,7 @@ "tfc.recipe.barrel.tfg.barrel.cooling_water_3": "Охолоджувальна Вода", "tfc.recipe.barrel.tfg.barrel.cooling_water_4": "Охолоджувальна Вода", "tfc.recipe.barrel.tfg.sealed_barrel.prepared_leather_gloves": "Замочування Шкіряних Рукавичок", - "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Витискання олії з ріпаку", + "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Видобуток олії з каноли", "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "Витискання олії з соняшника", "gtceu.aqueous_accumulator": "Водний акумулятор", "tfg.food_recipe.brining": "Засолювання", @@ -1026,7 +1063,7 @@ "quests.create_logistics.packager.subtitle": "Запакуй усе", "quests.create_logistics.packager.desc.1": "Коли подається &cсигнал редстоуну&r, &3Пакувальник&r запаковує предмети з блока, до якого він прикріплений (бік підключення можна змінити за допомогою &5гайкового ключа&r), і видає акуратну картонну упаковку. Кожна така упаковка має обсяг на 9 слотів, тож це чудовий спосіб переміщувати багато предметів одночасно. Щоб створити Пакувальник, знадобиться чимало &dКованого заліза&r та &dЕлектронна трубка&r, а також купа &dКартону&r (&dПапір&r і &dКлей&r).\n\nЗверни увагу: після створення Пакувальник працює без додаткового картону, тож про обслуговування можна не турбуватись!", "quests.create_logistics.packager.desc.2": "Якщо прикріпити &3табличку&r до Пакувальника, він автоматично наноситиме її текст на всі упаковки як адресу призначення. Це стане особливо корисним, коли ти почнеш налаштовувати маршрутизацію упаковок по базі.\n\nПакувальники також можуть розпаковувати будь-які упаковки, які потрапляють до них, вивантажуючи вміст у підключений інвентар.\n\n&c&lЗверни увагу: обрамлені таблички для цього не підходять!&r!", - "quests.create_logistics.frogport.title": "Package Frogports", + "quests.create_logistics.frogport.title": "Пакетні жабопорти", "quests.create_logistics.frogport.subtitle": "Ланцюг командування", "quests.create_logistics.frogport.desc.1": "&3Пакувальні Жабопорти&r — один із трьох способів переміщення упаковок і доставки їх у потрібне місце. Вони можуть підвішувати упаковки до &3Ланцюгових конвеєрів&r, по яких ті транспортуються вздовж з’єднань ланцюгів. Щоб їх використовувати, спершу потрібно створити мережу &3Ланцюгових конвеєрів&r, з’єднаних між собою ланцюгами та підключених до живлення: підійде будь-який ланцюг із тегом &d#forge:chains&r. Клацни Пкм по з’єднанню ланцюга перед тим, як встановити Жабопорт, щоб він взаємодіяв із цим сегментом.\n\nЖабопорти, розміщені безпосередньо над &3Пакувальником&r, автоматично підвішують упаковки, створені цим Пакувальником.", "quests.create_logistics.frogport.desc.2": "Жабопорти можуть не лише надсилати упаковки, а й приймати їх. Якщо клацнути ПКМ по Жабопорту, відкриється його назва, яку можна змінити. Ця назва слугує &aадресою&r — якщо якась упаковка має відповідну адресу призначення, Жабопорт &aавтоматично забере її&r з ланцюгової мережі! Отримана упаковка буде поміщена в інвентар блока, на якому встановлено Жабопорт.\n\nГоловне, щоб ланцюгова мережа була &oякось&r з’єднана з вхідними та вихідними Жабопортами — тоді упаковка зрештою знайде шлях. Але ти можеш оптимізувати маршрути, щоб скоротити час подорожі.", @@ -1054,7 +1091,7 @@ "quests.create_logistics.fabricate_rose_quartz.title": "Джерело рожевого кварцу: MV", "quests.create_logistics.fabricate_rose_quartz.subtitle": "Так само добре, як і справжнє", "quests.create_logistics.fabricate_rose_quartz.desc": "Оскільки високорівнева логістика не є критичною для просування, ти можеш відкласти виготовлення Лінзи до етапу &bMV&r, коли зможеш зробити це вдома. &dРожевий кварц&r можна кристалізувати з його порошкової форми (суміш 8 частин редстоуну та 1 частини кварцу з Незеру) за допомогою &bПокращеного &3Автоклава&r, замінивши звичайну (дистильовану) воду на &bКрижану воду&r, щоб імітувати природні умови. Так само, на рівні &bMV&r саму &dЛінзу з рожевого кварцу&r можна вирізати з &dПластини рожевого кварцу&r, яку, своєю чергою, потрібно виготовити з повного блока кварцу (оскільки це пластина з самоцвіту, її слід обробляти в &3Різаку&r).", - "quests.create_logistics.rose_quartz_lens.title": "Rose-tinted Glasses", + "quests.create_logistics.rose_quartz_lens.title": "Рожеві окуляри", "quests.create_logistics.rose_quartz_lens.subtitle": "ПЛО (Потрібен Лише Один)", "quests.create_logistics.rose_quartz_lens.desc": "Яким би способом ти не здобув потрібні матеріали, для створення Лінзи тобі знадобиться &3Токарний верстат&r. &7Базового &3Токарного верстата&r буде достатньо, щоб виготовити лінзу з &dВишуканого рожевого кварцу&r, але якщо ти хочеш зробити її зі звичайної пластини, знадобиться краща техніка — &bПокращений &3Токарний верстат&r.\n\nЩойно лінза буде готова, її можна використати в &7Базовому &3Лазерному гравері&r разом із &dПодвійною пластиною з червоного сплаву&r для створення модуля &dПередавача&r — і при цьому лінза не буде витрачена.", "quests.create_logistics.stock_link.title": "Посилання на запаси", @@ -1139,7 +1176,7 @@ "quests.development.hull_zpm.subtitle": "М'яка і Мокра електроніка", "quests.development.hull_zpm.desc": "Це лінія &9Мокрої&r електроніки.\n\nЦе буде найбільший виклик автоматизації у цьому модпаку. Бажаю успіху.", "quests.gregtech_energy": "GregTech Енергія", - "quests.gregtech_energy.subtitle": "So how does all of that work?", + "quests.gregtech_energy.subtitle": "Ото як усе це працює?", "quests.gregtech_energy.start.title": "Давай щось пояснимо", "quests.gregtech_energy.start.desc": "Ми знаємо, що GregTech — не найпростіший мод для освоєння, особливо коли йдеться про &cенергетичну систему&r. Тому в цьому розділі ми не поспішаємо й пояснимо якомога більше.\n\nДеякі речі тут можуть не повністю зрозумітися до пізніших етапів твого розвитку, тож не переймайся. Просто намагайся засвоїти те, що можеш зараз, і не соромся &dповертатися до цього розділу&r, коли виникатимуть питання.\n\nМи розбили цей розділ на &eчотири категорії&r — кожна охоплює окремий аспект енергетичної системи GregTech. Ми надамо якомога більше прикладів, щоб тобі було легше зрозуміти, як усе працює.", "quests.gregtech_energy.start.task": "Вітаємо на борту", @@ -1169,7 +1206,7 @@ "quests.gregtech_energy.lv_generator.desc.1": "Усі ці — твої базові &61-блокові генератори&r. Вони мають лише один &9вхід&r для палива — чи то &eпра&r, &aгаз&r, чи &6рідке паливо&r — і видають рівно &e1A&r енергії на своєму енергетичному рівні.\n\nЗ ними легко працювати, і вони стануть твоїм &oпершим джерелом енергії&r у &5GregTech&r, доки ти не перейдеш до &dвеликих мультиблокових генераторів&r пізніше.\n\nЩоб дізнатися, яке паливо можна використовувати, &aEMI&r — твій найкращий друг, або ж заглянь у &bзавдання ліворуч&r, де ми перелічили найбільш &aоптимальні варіанти&r. А поки ось &lтри способи&r почати виробництво енергії — усі вони &aдоступні&r, вибір за тобою.", "quests.gregtech_energy.lv_generator.desc.2": "&e1. Парова енергія&r:\n\nЦе найкласичніший метод. Ви можете перетворити пару, вироблену вашими Котлами Високого Тиску, на EU за допомогою Парової Турбіни.\n\nВона генерує &e32 EU/t&r при &e64 mB/t&r пари. Якщо ви оберете цей шлях, ми наполегливо рекомендуємо створити Великий Бронзовий Котел, який легко можна заправити лавою, крезотом або іншими твердими паливами (перевірте JEI!).", "quests.gregtech_energy.lv_generator.desc.3": "&e2. Обертальна енергія&r:\n\nВи можете використати обертальну енергію з модифікації Create разом з Альтернатором для генерації RF, а потім перетворити її на EU за допомогою &7Перетворювача LV&r.\n\n(Перевірте завдання \"Альтернатори\" у LV для отримання додаткової інформації.)", - "quests.gregtech_energy.lv_generator.desc.4": "&e3. Біодизельна енергія (TFG-ексклюзив)&r:\n\nРіпак та соняшники можна переробити у великі об’єми Масла з Насіння. Об'єднайте його з TFC-Спиртом, щоб отримати Біодизель.\n\nЦей метод може здатися складнішим, але Біодизель надзвичайно потужний на рівнях &7LV&r та &bMV&r. У майбутньому він добре масштабується аж до &5EV&r завдяки &eБіодизелю з Підвищеним Цетановим Числом&r.\n\nЩоб використовувати Біодизель, вам знадобиться &7LV&r Двигун Внутрішнього Згоряння. Хоча він може бути трохи дорожчим, кожен mB Біодизелю дає велику кількість EU, що спрощує транспортування та зберігання.\n\nВибір за вами — як почати своє енергетичне виробництво.", + "quests.gregtech_energy.lv_generator.desc.4": "&e3. Біодизельна енергія (TFG-ексклюзив)&r:\n\nКанола та соняшники можна переробити у великі об’єми Масла з Насіння. Об'єднайте його з TFC-Спиртом, щоб отримати Біодизель.\n\nЦей метод може здатися складнішим, але Біодизель надзвичайно потужний на рівнях &7LV&r та &bMV&r. У майбутньому він добре масштабується аж до &5EV&r завдяки &eБіодизелю з Підвищеним Цетановим Числом&r.\n\nЩоб використовувати Біодизель, вам знадобиться &7LV&r Двигун Внутрішнього Згоряння. Хоча він може бути трохи дорожчим, кожен mB Біодизелю дає велику кількість EU, що спрощує транспортування та зберігання.\n\nВибір за вами — як почати своє енергетичне виробництво.", "quests.gregtech_energy.lv_generator.task": "Будь-який Генератор LV", "quests.gregtech_energy.mv_generator.title": "Генератори MV", "quests.gregtech_energy.mv_generator.subtitle": "У принципі такі самі, як і LV-генератори", @@ -1235,7 +1272,7 @@ "quests.gregtech_energy.storage.title": "Збереження Енергії", "quests.gregtech_energy.storage.subtitle": "Треба ж десь подіти всю цю енергію", "quests.gregtech_energy.storage.desc": "Зберігання енергії — одна з фундаментальних засад енергетичної системи в GregTech.\n\nЧому це так? Бо навіть найпотужніші генератори не здатні підтримувати стабільну подачу при запуску великого крафту — особливо на пізніх етапах гри.\n\nЩоб впоратися з цим, GregTech пропонує низку рішень для зберігання астрономічних обсягів EU. Такі сховища працюють як буфер між генерацією енергії та машинами, які її поглинають під час складних операцій.\n\nЧи то ти готуєшся до запуску реактора термоядерного синтезу, ВХР чи ланцюга крафтів масштабу HV–IV, резервний запас енергії стане ключем до стабільності.\n\nНе недооцінюй силу хорошої батареї — саме вона може врятувати твою базу від блекауту у критичний момент.", - "quests.gregtech_energy.storage.task": "Зрозуміло", + "quests.gregtech_energy.storage.task": "Я розумію", "quests.gregtech_energy.tank.title": "Зберігання пального", "quests.gregtech_energy.tank.subtitle": "Існують не лише електричні батареї", "quests.gregtech_energy.tank.desc.1": "Очевидно, що зберігання енергії також охоплює і зберігання пального, яке її генерує.\n\nУ цьому випадку, хоча Бочки та Ящики — непогані варіанти на ранніх етапах, не варто недооцінювати &dСупербак&r і &dСуперскриню&r.", @@ -1261,7 +1298,7 @@ "quests.gregtech_energy.spending_energy.desc.2": "Стандартна механіка:\n- Якщо мультиблок може приймати два енергетичних люки (більшість з них), це дозволяє використовувати рецепти вищого рівня, ніж базовий рівень машини.\n\nПриклад:\nЯкщо ви використовуєте Велику Змішувальну Ємність і встановите два енергетичних люки IV, вона зможе обробляти рецепти Змішувача рівня &cLuV&r.\n\nЦе одна з ключових переваг мультиблоків над одноблоковими машинами — щоб оновити їх до наступного рівня, достатньо замінити енергетичні люки, а не всю машину.", "quests.gregtech_energy.spending_energy.desc.3": "Деякі мультиблоки приймають лише один енергетичний люк, але це не означає, що ви обмежені 1A!\n\nВи все ще можете використовувати енергетичний люк на 4A або 16A. Це дозволить &bРозгону&r рецептів, але не змінить їх рівень.\n\nПриклад:\nВеликий Збирач Схем приймає лише один енергетичний люк. Якщо встановити енергетичний люк IV на 4A, ви зможете розігнати всі рецепти рівня IV і нижче.\n\nОднак він не може створювати рецепти рівня LuV, оскільки машина не підтримує кілька люків. Це обмеження зроблено навмисно, щоб запобігти пропуску системи прогресу GregTech.", "quests.gregtech_energy.spending_energy.desc.4": "Тож пам’ятайте: більше амперів на одному люку означає швидшу обробку, але для розблокування рецептів вищого рівня потрібні два люки.", - "quests.gregtech_energy.spending_energy.task": "Зрозуміло", + "quests.gregtech_energy.spending_energy.task": "Я розумію", "quests.gregtech_energy.overclock.title": "Розгін", "quests.gregtech_energy.overclock.subtitle": "Базова механіка покращення", "quests.gregtech_energy.overclock.desc.1": "Чули про розгін, але не зовсім розумієте, що це? Давайте трохи розберемось.\n\nПочнемо з основ:\n&dLV&r — максимум 32 EU/t — іноді менше, але ніколи більше.\n&dMV&r — до 128 EU/t.\n&dHV&r — досягає 512 EU/t.\nФактично, кожен рівень — це збільшення споживання енергії в 4 рази.", @@ -1289,7 +1326,7 @@ "quests.high_voltage.energium_crystals.subtitle": "Науково-фантастичні батареї!", "quests.high_voltage.energium_crystals.desc": "&aКристали Енергіуму&r зберігають значну кількість &9EU&r. Їх також можна вважати дешевшими.", "quests.high_voltage.autoclave.title": "Автоклав HV", - "quests.high_voltage.autoclave.subtitle": "Home-grown batteries", + "quests.high_voltage.autoclave.subtitle": "Домашні акумулятори власного виробництва", "quests.high_voltage.autoclave.desc": "&3Автоклав Hv&r — хоч і необов’язковий, але це машина, яку ви точно захочете отримати.\n\nВона відкриває доступ до унікальних батарей, які &6значно перевершують&r свої стандартні аналоги.", "quests.high_voltage.chem_bath.title": "Купання під Високою Напругою", "quests.high_voltage.chem_bath.subtitle": "Будь ласка, не приймай ванну з тостером...", @@ -1357,6 +1394,7 @@ "quests.high_voltage.lcr.desc.2": "Існують також ексклюзивні рецепти для &3ВХР&r. Наприклад, &dРадон&r наразі можна створити лише в ВХР.\n\nУсі &dРозгони&r в &3ВХР&r мають &6100%% ефективність&r (так звані \"Ідеальні розгони\"); кожен розгін &5вчетверо&r пришвидшує обробку, на відміну від звичайного подвоєння.\n\n&3ВХР&r має ще одну &6перевагу&r: можна використати &32 Енергетичні люки&r, щоб запускати рецепти &5на наступному рівні&r, подібно до &3Електричної доменної печі&r.", "quests.high_voltage.lcr.desc.3": "&9Порада:&r Враховуючи кількість ВХР, яку ти можеш використати, чому б не застосувати &dспільні стіни&r на повну?\n\nМожна поділити один стандартний &3Енергетичний люк&r (2A) між двома ВХР.\n\nМожна також спробувати поділити &3Люки введення/виведення&r, але переконайся, що кожен ВХР виконує правильний рецепт.\n\nЗверни увагу: &dЛюки обслуговування&r не можна ділити.", "quests.high_voltage.tnt.title": "ТНТ", + "quests.high_voltage.tnt.task": "Будь-яка вибухівка", "quests.high_voltage.tnt.desc.1": "Готуйся створювати вибухівку — вона знадобиться для &cІмплозійного компресора&r. Маєш чотири варіанти, від простого до найскладнішого, але ми радимо якнайшвидше перейти на &dІндустріальний ТНТ&r.", "quests.high_voltage.tnt.desc.2": "&cТНТ&r (тринітротолуол) більше не можна виготовити зі звичайного Пороху та Піску. Натомість доведеться створити &aЗагущений Толуол&r і відреагувати його з Сірчаною кислотою для отримання ТНТ.\n\nРецепт у &3HV Хімічному Реакторі&r дозволяє подвоїти вихід &aЗагущеного Толуолу&r, але потребує додаткових ресурсів.", "quests.high_voltage.tnt.desc.3": "Ніяких простих порад щодо &aТолуолу&r ми не маємо — яким би шляхом ти не пішов, це буде непросто.\n\nАле не пропусти прямий рецепт з &aВажкого пального&r у &aТолуол&r у одноблоковій &3Дистилярні&r.\n\n&aТолуол&r також можна опціонально використати на &5EV&r рівні для створення &dБензину&r.\n\n&cТНТ&r використовується в &3Імплозійному компресорі&r для створення Самоцвітів. А ще він вибухає.", @@ -1449,6 +1487,14 @@ "quests.high_voltage.welcome_moon.title": "Я на &3Місяці&r!", "quests.high_voltage.welcome_moon.subtitle": "Сподіваюся, в тебе є все, щоб повернутися", "quests.high_voltage.welcome_moon.desc": "&2Вітаємо&r, ти успішно приземлився на &7Місяці&r! \nТут ти знайдеш жили &bІстинний кварц&r і метеорити, які дозволяють почати розблоковувати &dAE2&r.\n\nАле це ще не все — деякі жили тут набагато щільніші, ніж на Землі.\n\nНаприклад, на Місяці легко знайти жили &6Ільменіту&r, &7Бокситу&r, &7Алюмінію&r та &5Хроміту&r. \nСтворення невеликої бази тут буде вирішальним для подальшого прогресу.\n\nНайбільшим викликом буде транспортування ресурсів, адже наразі немає зручних міжвимірних інструментів, таких як &5Ендер-Скриня&r або &dAE2 Квантовий Зв’язок&r.\n\nСподіваємось, ти добре підготувався — інакше доведеться майструвати другу ракету та скафандр, щоби забрати свій труп!", + "quests.high_voltage.gun.title": "Візьміть зброю", + "quests.high_voltage.gun.subtitle": "А якщо це не спрацює — використайте більше зброї", + "quests.high_voltage.gun.task1": "Будь-яка зброя", + "quests.high_voltage.gun.task2": "Будь-які ліки або витриманий алкоголь", + "quests.high_voltage.gun.desc": "Занадто розслабився на Землі? На Місяці ти будеш не сам, тож підготуйся до оборони — меча чи кам’яних дротиків буде недостатньо.\n\nОбери гарну гармату (якщо не знаєш яку — радимо &o«Clockwork» Снайперка&r), створи боєприпаси, а якщо хочеш чогось особливого — спробуй насадки.\n\nТакож варто взяти поживну їжу для підвищення макс. HP (спробуй пайки!), а ще алкоголь і ліки для бафів і лікування.", + "quests.high_voltage.space_survival.title": "Затишок далеко від дому", + "quests.high_voltage.space_survival.subtitle": "Більше, ніж просто шахтарський вимір", + "quests.high_voltage.space_survival.desc": "Якщо ти ще не ознайомився, обов’язково переглянь розділ завдань &3Поради — Космічне виживання&r! У ньому є вся необхідна інформація для створення повноцінної колонії на Місяці.", "quests.low_voltage": "&7LV&r – Низька напруга", "quests.low_voltage.subtitle": "Приборкай електрику та розпочни свою подорож у GregTech", "quests.low_voltage.lv_machine_hull.title": "Твій другий корпус машини", @@ -1473,7 +1519,7 @@ "quests.low_voltage.lbb.subtitle": "Бум, бум, бум, бум", "quests.low_voltage.lbb.desc.1": "&3Великий котел&r — це &6необов’язковий&r потужний варіант Малих котлів. Він працює на твердому або рідкому паливі. \n\nЯкщо ти хочеш виробляти енергію на основі пари, це альтернатива паровому двигуну Create. Майбутні варіанти енергопостачання описані в розділі &bMV&r. \n\nНа даний момент, через баг у GTCEu, ця машина ніколи не вибухає, але тобі варто налаштувати її так, щоб вона ніколи не залишалася без води, як і твої Малі котли, щоб вона не вибухнула, коли баг буде виправлений.", "quests.low_voltage.lbb.desc.2": "Після повного нагрівання &3LBB&r виробляє 800 пари за тик, що після конверсії дає &d400EU/t&r, або 12,5 базових парових турбін. Ця (відносно!) величезна потужність має ціну у вигляді &lвеликої&r кількості пального. &5З огляду на це&r, GUI дозволяє тобі &9знизити потужність&r котла до 25 відсотків, що дає 200 пари за тик. Це &d100EU/t&r, або трохи більше 3 базових парових турбін. \n\nМи рекомендуємо відкласти створення цього котла, поки ти не будеш готовий живити свою ЕДП.", - "quests.low_voltage.lbb.desc.3": "У TerraFirmaGreg у тебе є кілька варіантів пального. Ти можеш використовувати шланговий шків, щоб добувати нескінченну &cлаву&r з глибокого підземного озера, або налаштувати ферму дерев, щоб отримувати нескінченні &8вугілля&r та &8креозот&r. Останній варіант — це величезні поверхневі жили &8вугілля&r, які ти можеш добувати за допомогою автоматизованих шахтних машин і перетворювати на кокс, отримуючи значно більше креозоту, ніж із деревного вугілля.", + "quests.low_voltage.lbb.desc.3": "У TerraFirmaGreg у тебе є кілька варіантів палива. Можна використати Шланговий Шків, щоб витягнути лаву з глибокого підземного озера, або створити ферму дерев для отримання деревного вугілля та креозоту. Нарешті, існують величезні поверхневі поклади кам’яного вугілля, які можна добувати за допомогою автоматичних шахтарських машин і перетворювати на кокс, отримуючи значно більше креозоту, ніж із деревного вугілля.", "quests.low_voltage.lv_polariser.title": "Базовий поляризатор", "quests.low_voltage.lv_polariser.subtitle": "Поляризатор поляризує!", "quests.low_voltage.lv_polariser.desc": "Одна з найдешевших — якщо не найдешевша — &7LV&r машина. Використовуй її для створення &6Магнітних Стрижів без Редстоуна&r для своїх моторів. Щоразу, коли ти починаєш масове виробництво моторів, ця машина зекономить тобі цілі стопки Редстоуна.", @@ -1492,8 +1538,8 @@ "quests.low_voltage.lv_seed_oil.desc": "У тебе є два варіанти для виробництва &aОлії з насіння&r: або за допомогою &9Вакуумної камери&r, або, якщо вона вже є, &7Екстрактор Lv&r чудово впорається з цим завданням.\n\nТакож зверни увагу, що &aОлія з насіння&r використовується не лише для створення &2Біодизеля&r.\n\nЇї також можна переробити на &6Мастило&r або одразу відправити до твого &cВогняного пальника&r як паливо.", "quests.low_voltage.lv_seeds.title": "Спочатку візьми насіння", "quests.low_voltage.lv_seeds.subtitle": "Це високі рослини", - "quests.low_voltage.lv_seeds.desc": "Якщо ти натрапиш на ці рослини — збери їх і почни ферму.\n\nВони стануть найкращим джерелом &aОлії з насіння&r — рідини, що використовується для виробництва &eБіодизеля&r. Ріпак трохи стійкіший до низьких температур, а соняшник добре росте в теплому кліматі. Ти також можеш вирощувати їх у своїй Електричній теплиці, якщо не хочеш витрачати багато часу на фермерство — в такому разі використовуй ріпак, адже він не псується.\n\nЦе буде чудовим надбанням для виробництва енергії.", - "quests.low_voltage.lv_seeds.task": "Ріпак або соняшник", + "quests.low_voltage.lv_seeds.desc": "Якщо натрапите на ці рослини — обов’язково підберіть і почніть вирощувати.\n\nВони стануть вашим найкращим джерелом &aРослиної олії&r — рідини, що використовується для виробництва &eБіодизелю&r. Канола трохи стійкіша до низьких температур, а соняшники краще почуваються в теплішому кліматі. Ви також можете вирощувати їх в електричній теплиці, якщо не хочете витрачати багато часу на фермерство — щоправда, доведеться витрачати трохи енергії на їхнє зростання.", + "quests.low_voltage.lv_seeds.task": "Канола або Соняшник", "quests.low_voltage.lv_turbo_charge.title": "Швидка зарядка", "quests.low_voltage.lv_turbo_charge.subtitle": "Корисно для швидшого заряджання електроінструментів", "quests.low_voltage.lv_turbo_charge.desc": "&oЦя тема квесту є необов’язковою, але може зацікавити тебе. Ми додали її заради повноти.&r \n\n&3Швидка зарядка&r заряджає &6RF та EU&r предмети, такі як &9Дрилі&r, надзвичайно швидко. \n\nВін приймає до 4 Ампер на кожен предмет, який заряджає, що робить його &6вдвічі швидшим&r за &3Буфер батарей&r. Однак він не може розряджати. \n\n&eБудь-який&r Зарядний пристрій завершить цей квест.", @@ -1590,7 +1636,7 @@ "quests.low_voltage.other_machines.desc": "Ми не будемо розглядати &dповний масштаб звичайної обробки руди&r. Чому звичайної? Деякі руди потребують спеціальної обробки, але це тема для набагато пізніше. О ні, ми вже захопилися! \n\nДеякі машини, такі як &bХімічна Ванна&r або &bЕлектролізер&r, можуть бути корисними. \n\nЗлякався обробки руди? Переглянь спеціальний розділ &cОбробка Руди&r для повного покрокового керівництва!", "quests.low_voltage.other_machines.task": "Я погоджуюся втратити здоровий глузд", "quests.low_voltage.lv_chemical_bath.title": "Базова Хімічна Ванна", - "quests.low_voltage.lv_chemical_bath.subtitle": "The Chemical Bath bathes...", + "quests.low_voltage.lv_chemical_bath.subtitle": "Хімічна ванна занурює...", "quests.low_voltage.lv_chemical_bath.desc.1": "&lПозa межами обробки руди:&r \n\nТи можеш використовувати Хімічну Ванну для заміни рецептів, що використовують &6запечатану бочку&r, роблячи виробництво паперу та шкіри &6безболісним&r. \n\nЄ й інші менш важливі рецепти, такі як фарбування різних предметів і блоків або їх відбілювання.", "quests.low_voltage.lv_chemical_bath.desc.2": "&lДля обробки руди:&r \n\nДеякі &aДроблені Руди&r мають альтернативні шляхи при промиванні до &aОчищеної Руди&r, що включає купання у &aРтуті&r або &aПерсульфаті Натрію&r. Цей крок не є надто важливим, якщо тільки тобі не потрібен той особливий &6Побічний Продукт&r. Це може бути чудовим альтернативним джерелом Срібла (натяк, натяк!).", "quests.low_voltage.lv_electroliser.title": "Базовий Електролізер", @@ -1665,6 +1711,7 @@ "quests.low_voltage.lv_extractor.desc.2": "&l&3Лор:&r&o Ти помітив, що ця машина поєднує функції Екстрактора та Рідинного Екстрактора? У попередніх версіях GregTech це були окремі машини.", "quests.low_voltage.lv_chemical_reactor.title": "Базовий Хімічний Реактор", "quests.low_voltage.lv_chemical_reactor.subtitle": "Хімія для чайників", + "quests.low_voltage.lv_chemical_reactor.task": "Рідка гума", "quests.low_voltage.lv_chemical_reactor.desc.1": "&3Хімічний Реактор&r буде необхідний для &lбагатьох&r рецептів. \n\nНумо випробуймо його — чому б не використати твій щойно створений Хімічний Реактор, щоб розблокувати новий, &6кращий рецепт Гуми&r? Гума &dнепридатна&r у вигляді рідини, тому тобі знадобиться ще одна машина для її подальшої обробки.", "quests.low_voltage.lv_chemical_reactor.desc.2": "Ти не можеш створити Гуму, використовуючи лише Хімічний Реактор, тому ось кілька &aінших машин&r, які тобі варто розглянути: \n\n&3Затверджувач&r допоможе тобі перетворити рідку Гуму безпосередньо в &aГумові Листи&r. Вони тобі знадобляться надалі. \n\nПотім ти можеш скористатися &3Збирачем&r, щоб використовувати розплавлену Гуму для створення &aКабелів&r. Це не важливо для Олов'яних Кабелів, але кращі кабелі &eпотрібно&r буде створювати саме в Збирачі. \n\n&eПримітка:&r Щоб здати рідину, збережи її в &lбудь-якому&r резервуарі у своєму інвентарі. Бочка — ідеальний варіант.", "quests.low_voltage.lv_fluid_solidifier.title": "Базовий Затверджувач Рідин", @@ -1749,14 +1796,14 @@ "quests.medium_voltage.mv_battery.desc": "Як завжди, ми наполегливо рекомендуємо використовувати &bБуфер Акумуляторів&r — навіть якщо ви споживаєте більше &6енергії&r, ніж виробляєте, ви не втратите її миттєво, а зможете відновити запас, поки ваші машини не працюють.", "quests.medium_voltage.mv_battery.task": "Будь-який MV Буфер Акумуляторів", "quests.medium_voltage.mv_batteries.title": "Кращі батареї", - "quests.medium_voltage.mv_batteries.subtitle": "Baby Got Battery", + "quests.medium_voltage.mv_batteries.subtitle": "У малюка з’явився акумулятор", "quests.medium_voltage.mv_batteries.desc": "&bMV&r Батареї сподобаються тобі, якщо ти хочеш буферизувати Енергію, так само як &7LV&r. \n\nВартість у &aНатрії&r, &aЛітії&r або &aКадмії&r зростає до 8 пилу, тому варто використовувати те, чого у тебе найбільше. Різниця в ємності не &7ТАК&r велика, зрештою! \n\nОтримай &eбудь-яку&r Батарею, щоб завершити Завдання.", "quests.medium_voltage.mv_steel_alloy.title": "Сталеві Сплави", "quests.medium_voltage.mv_steel_alloy.subtitle": "Загартуй своє серце", "quests.medium_voltage.mv_steel_alloy.desc": "Ванадієва сталь потрібна в невеликих кількостях у прогресії. Вона &6майже вчетверо міцніша&r за звичайну сталь, якщо використовується в інструментах GregTech. Ванадій добувається з &aВанадієвого Магнетиту&r, який ти міг зустріти у магнетитових жилах. \n\nІнші сталеві сплави включають Синю Сталь, Червону Сталь та Чорну Сталь! \n\nВізьми трохи Синьої Сталі безкоштовно — вона вдвічі міцніша за звичайну сталь.", "quests.medium_voltage.pyrolyse.title": "Піролізна Піч", "quests.medium_voltage.pyrolyse.subtitle": "Термічний Розклад", - "quests.medium_voltage.pyrolyse.desc.1": "&3Піролізна Піч&r — це електричний аналог &3Коксової Печі&r. Вона може виробляти &9Коксівне Вугілля&r та &9Деревне Вугілля&r з побічним продуктом &9Креозотом&r, як і раніше, але також має додаткові &6Органічні Побічні Продукти&r, найкориснішим з яких є &aДеревний Дьоготь&r. \n\nЩе одним продуктом є &aБіомаса&r, яка зараз є більш актуальною для твого прогресу.", + "quests.medium_voltage.pyrolyse.desc.1": "&3Піролізна Піч&r — це електричний аналог &3Коксової Печі&r. Вона може виробляти &9Коксове Вугілля&r та &9Деревне Вугілля&r з побічним продуктом &9Креозотом&r, як і раніше, але також має додаткові &6Органічні Побічні Продукти&r, найкориснішим з яких є &aДеревний Дьоготь&r. \n\nЩе одним продуктом є &aБіомаса&r, яка зараз є більш актуальною для твого прогресу.", "quests.medium_voltage.pyrolyse.desc.2": "Побічні продукти можна переганяти для отримання різноманітних органічних ресурсів, причому &oрізні&r побічні продукти дають &oрізні&r співвідношення &oрізних&r хімічних речовин. \n\nТобі потрібно заглянути в &9Завдання з Перегонки&r, щоб розібратися в силі дистиляції...", "quests.medium_voltage.pyrolyse.desc.3": "Є рецепти, які можуть приймати &bАзот&r для подвоєння швидкості. Зараз це не надто варто переслідувати, але Азот згодом стане безкоштовним і нескінченним. \n\nТобі цілком вистачить одного &3LV Енергетичного Люка&r та Надпровідників для стабільного постачання &d64 EU/t&r. \n\nКрім того, &3Купронікелеві Котушки&r ідеальні для початкового використання Піролізної Печі, але з часом ти можеш захотіти оновитися до &bКанталу&r.", "quests.medium_voltage.pyrolyse.desc.4": "&9&lПримітка:&r&l Рослинний шлях — один із варіантів отримання &9&lЕтилену&r&l, який є необхідним хімічним елементом для прогресу до &6HV&r&l. Інший шлях включає використання Нафти.&r \n\nПіролізна Піч залишається &dнеобов’язковою&r. Однак її створення дуже вигідне — як для отримання Енергії, так і для різних Побічних Продуктів, тому ми настійно рекомендуємо тобі розглянути цей варіант. \n\n&l&3Лор:&r&o У GT5u структура Піролізної Печі була відомою як гігантська коробка з лише 9 котушками всередині. Гравці зазвичай витрачали кілька хвилин на пошук проблеми через відсутність попереднього перегляду EMI.", @@ -1808,7 +1855,7 @@ "quests.medium_voltage.mv_ethanol.desc": "Поклади свою раніше створену &aБіомасу&r в &3MV Дистилярню&r, щоб отримати &aЕтанол&r. \n\nТобі знадобиться він для &dЕтилену&r, реагуючи з &aСірчаною Кислотою&r у &3MV Хімічному Реакторі&r... якщо тільки ти не обрав Нафтовий шлях. \n\nЯкщо у тебе вже є значний запас Етанолу, подумай про створення та дистиляцію &9Ферментованої Біомаси&r у &3Дистиляційній Вежі&r (коли дійдеш до цього!) для отримання додаткових хімікатів. \n\n&cНе намагайся&r використовувати Етанол як джерело енергії... це, мабуть, найгірше його застосування. Якщо тобі потрібна органічна &9Енергія&r, краще зверни увагу на &dБензол&r!", "quests.medium_voltage.mv_bio_diesel.title": "Церква Біо-Дизелю", "quests.medium_voltage.mv_bio_diesel.subtitle": "Сила квітів", - "quests.medium_voltage.mv_bio_diesel.desc": "Хочеш спробувати щось рослинного походження, але без лісових ферм? Спробуй &3Біо-Дизель&r! Найкращий спосіб його отримання — через &dОлію з Насіння&r, яку можна добути з Соняшників або Ріпаку. Просто змішай її з невеликою кількістю Етанолу та Гідроксиду Натрію (отриманого з Морської Води!) у Хімічному Реакторі — і все готово! Бонусом цей метод також дає Гліцерин, який можна перетворити на &dЕтилен&r!", + "quests.medium_voltage.mv_bio_diesel.desc": "Хочеш спробувати щось рослинного походження, але без лісових ферм? Спробуй &3Біо-Дизель&r! Найкращий спосіб його отримання — через &dОлію з Насіння&r, яку можна добути з Соняшників або Каноли. Просто змішай її з невеликою кількістю Етанолу та Гідроксиду Натрію (отриманого з Морської Води!) у Хімічному Реакторі — і все готово! Бонусом цей метод також дає Гліцерин, який можна перетворити на &dЕтилен&r!", "quests.medium_voltage.mv_mutli_channel.title": "Багатоканальні Труби", "quests.medium_voltage.mv_mutli_channel.subtitle": "Це вже AE2?", "quests.medium_voltage.mv_mutli_channel.desc": "Звичайні &o&dGregTech&r Рідинні Труби можуть транспортувати лише один тип рідини за раз. \n\n&3Чотириканальні Рідинні Труби&r можуть передавати чотири різні типи рідин. &3Дев’ятиканальні Рідинні Труби&r можуть передавати дев’ять різних типів! Корисно для компактних налаштувань. \n\n&3Дев’ятиканальні Рідинні Труби&r будуть корисні на рівні &5EV&r для обробки численних виходів &3Дистиляційної Вежі&r. \n\nОтримай &eбудь-яку&r, щоб завершити цей квест.", @@ -2002,7 +2049,7 @@ "quests.metal_age.beneath_graphite.title": "Джерело графіту: Безодня", "quests.metal_age.beneath_graphite.subtitle": "До Глибин", "quests.metal_age.beneath_graphite.desc": "Глибоко, ГЛИБОКО під землею, за межами основи світу, ви знайдете Безодню — складну мережу печер, наповнених небезпеками різного роду на кожному кроці. У Безодні можна знайти величезні, високі жилки графіту, але певний монстр може її охороняти...!\n\nПоки ви тут, ви також можете шукати антрацит — чудове паливо для виробництва сталі.\n\nВиживання у Безодні є складним, тому зверніться до розділу \"Поради TerraFirmaGreg\" у цьому довіднику та польового посібника для отримання додаткової інформації.", - "quests.metal_age.beneath_graphite.task": "Пройдіть шар основної породи в Основному світі й дістаньтеся Безодні", + "quests.metal_age.beneath_graphite.task": "Пройдіть корінну породу в Основному світі й досягніть Безодні", "quests.metal_age.kaolin_clay.title": "Каолінова глина", "quests.metal_age.kaolin_clay.subtitle": "Подорож за Каоліном: Нове покоління", "quests.metal_age.kaolin_clay.desc": "Як тільки ви знайдете каолінову глину, варто принести стільки, скільки ви зможете перенести! На жаль, лише 20 відсотків з неї успішно випалюється у каолінітовий порошок, тому рекомендується випалювати її на місці за допомогою ямних печей, щоб заощадити місце в інвентарі.\n\nПісля того, як ви створите тигель і доменну піч, вам знадобиться не так багато каолінової глини, але все одно варто взяти більше, ніж здається потрібним, щоб уникнути повторної подорожі.\n\nP.S.: Якщо ви знайшли кров’яні лілії, але не знайшли глину, спробуйте копати трохи глибше! Іноді вона з'являється трохи під землею.", @@ -2223,7 +2270,7 @@ "quests.space_survival.stone_dust_centrifuging.task": "Будь-яке ", "quests.space_survival.compressed_gases.title": "Стиснені гази, придатні для дихання", "quests.space_survival.compressed_gases.subtitle": "Бо чистий кисень — це смертельно небезпечно", - "quests.space_survival.compressed_gases.desc": "Відчуваєш, як трохи бракує повітря? У космосі без чогось для дихання не обійтись — тому варто виробляти один із стиснених газів, заснованих на реальних сумішах для глибоководного занурення!\n\nЗаправити скафандр ними можна так само, як відро — просто перелити. А якщо взяти з собою &bГазовий Балон&r, то з нього можна “пити”, поповнюючи запаси без потреби знімати костюм.\n\n&2Нітрокс&r — найпростіший для виробництва на Землі, а &eГеліокс-3&r — можна створити на Місяці.\n\nПовний скафандр (1000mB) дає тобі &c20 хвилин&r життя.", + "quests.space_survival.compressed_gases.desc": "Відчуваєш, що трохи не вистачає повітря? У космосі без чогось для дихання не обійтись, тож варто звернути увагу на виробництво стиснених газів — вони засновані на реальних сумішах, які використовуються для глибоководного занурення!\n\nКосмічний костюм можна заповнити ними так само, як заповнюється відро, або ж, якщо взяти з собою &bГазовий балон&r, ти зможеш «пити» з нього, щоб поповнити запас газу в костюмі без необхідності його знімати.\n\n&2Нітрокс&r — найпростіший для виробництва на Землі, а &eГеліокс-3&r можна налаштувати на Місяці.\n\nПовністю заповнений костюм (2000 мБ) забезпечить приблизно &c20 хвилин&r дихання.", "quests.space_survival.compressed_gases.task": "Будь-який стиснений газ, придатний для дихання", "quests.space_survival.zip_gun.title": "Повітряна зброя", "quests.space_survival.zip_gun.subtitle": "Наче реактивний ранець у твоїй долоні", @@ -2427,7 +2474,7 @@ "quests.steam_age.steam_engine.desc": "Водяні колеса та вітряки вже не справляються? Яка ж це парова епоха без справжнього парового двигуна! Кожен паровий двигун може видавати цілих 256 ОД (Одиниць Потужності), надаючи тобі значно більше енергії для експериментів.\n\nПалаючі Пальники можна створити, не виходячи з дому, а за допомогою Механічної Руки їх можна автоматично заправляти твердим паливом або рідким паливом у відрі (наприклад, креозотом). Також для перегріву можна використовувати Вугільні Самоцвіти, Антрацит і Кокс.", "quests.steam_age.fuel_sources.title": "Додаткові Джерела Пального", "quests.steam_age.fuel_sources.subtitle": "Впроваджуємо силу в парову силу", - "quests.steam_age.fuel_sources.desc": "Парова машина може працювати з ширшим набором рідинних палив, ніж Котел Високого Тиску. Хоча Креозот або Лава — це найпростіші варіанти на даному етапі, ти можеш зацікавитися й рослинними оліями, такими як &eОлія з Насіння&r з Соняшників або Ріпаку.\n\nКреозот і Лава погано масштабуються на пізніх рівнях, натомість Біопальне може бути перетворене в Дизель, а потім — у Дизель з Цетановим Підсиленням. Тож якщо тобі до душі ця ідея — почни закладати великі поля для вирощування рослин на олію!", + "quests.steam_age.fuel_sources.desc": "Парова машина може працювати з ширшим набором рідинних палив, ніж Котел Високого Тиску. Хоча Креозот або Лава — це найпростіші варіанти на даному етапі, ти можеш зацікавитися й рослинними оліями, такими як &eОлія з Насіння&r з Соняшників або Каноли.\n\nКреозот і Лава погано масштабуються на пізніх рівнях, натомість Біопальне може бути перетворене в Дизель, а потім — у Дизель з Цетановим Підсиленням. Тож якщо тобі до душі ця ідея — почни закладати великі поля для вирощування рослин на олію!", "quests.steam_age.straw.title": "Автоматизація Рідкого Палива", "quests.steam_age.straw.subtitle": "Горючі поїльники", "quests.steam_age.straw.desc": "Якщо клацнути ПКМ по Пекельному Пальнику з &aСоломинкою&r, то можна легко подавати пальне прямо в нього через будь-яку трубу! Під’єднай його до виходу креозоту з Коксової Печі — і твої Парові Двигуни не зупиняться.\n\nУ JEI доступний повний список можливих палив із їхньою ефективністю.", @@ -2621,7 +2668,7 @@ "quests.stone_age.clay_products.title": "Глиняні вироби", "quests.stone_age.clay_products.subtitle": "Я ж казав, що глина універсальна.", "quests.stone_age.clay_products.desc": "Ось усі вироби, які ви можете створити з глини. Форми використовуються для роботи з металами, Корчага — для зберігання предметів, а інші мають призначення, описані в Польовому путівнику. Думаєте, вам під силу створити їх усі?", - "quests.stone_age.make_jug.title": "Керамічний глечик", + "quests.stone_age.make_jug.title": "Керамічний глек", "quests.stone_age.make_jug.subtitle": "Ранній контейнер для рідин", "quests.stone_age.make_jug.desc": "Глечик — це найпростіший контейнер для рідин, але він може вміщати лише 100mB. Ви також можете пити з нього та дути в нього, щоб створювати звуки!", "quests.stone_age.make_saw_mold.title": "Форма для пилки", @@ -2728,7 +2775,7 @@ "quests.tfg_tips.portable_storage.desc": "У своїх подорожах ти можеш дослідити цілу &oкупу&r місць і врешті-решт набрати багато мотлоху. Ця гілка завдань пропонує кілька варіантів для розширення твого мобільного інвентарю.", "quests.tfg_tips.toolbelt.title": "Пояс для інструментів та Сумки", "quests.tfg_tips.toolbelt.subtitle": "Ці інструменти займають багато місця, давай це виправимо!", - "quests.tfg_tips.toolbelt.desc": "З &dПоясом для інструментів&r ти зможеш керувати кількома інструментами без зайвих витрат слотів інвентарю! Цей зручний предмет можна розмістити у спеціальному &3Слоті поясу&r в твоєму &4Меню Curios&r. Ти можеш вставляти та витягати інструменти за допомогою &cгарячої клавіші.&r Спочатку він має лише два слоти, але їх можна розширити, додаючи &aСумки для поясу&r. \n\n&lЧерез баг у цьому моді неможливо покращити &dПояс для інструментів&f, якщо він був пофарбований або містить інструменти. Спочатку спорожни його!", + "quests.tfg_tips.toolbelt.desc": "З &dПоясом інструментів&r ви зможете керувати кількома інструментами без зайвих витрат слотів інвентарю! Цей зручний предмет можна розмістити в спеціальному &3слоті пояса&r у вашому &4меню Curios&r. Ви можете вставляти та діставати інструменти за допомогою &cгарячої клавіші.&r Спочатку він має лише два слоти, але їх кількість можна збільшити, додавши &aСумки для пояса&r.", "quests.tfg_tips.maxed_out_toolbelt.title": "ВСІ ІНСТРУМЕНТИ", "quests.tfg_tips.maxed_out_toolbelt.subtitle": "Цей пояс, мабуть, уже дуже важкий...", "quests.tfg_tips.maxed_out_toolbelt.desc": "&dToolbelt&r може вмістити 7 додаткових сумок, тобто 9 інструментів в одному поясі!", From 3933e6bcf611909a81e42116aef59f673eee1c2b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 22:35:23 +0100 Subject: [PATCH 14/52] update pakku --- pakku-lock.json | 367 ++++++++++++++++++++++++------------------------ 1 file changed, 184 insertions(+), 183 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 38eaa01cc..5a2807488 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1401,30 +1401,6 @@ "modrinth": "OfKzpbRU" }, "files": [ - { - "type": "curseforge", - "file_name": "baguettelib-1.20.1-Forge-1.0.0.jar", - "mc_versions": [ - "1.20.2", - "1.20.3", - "1.20.1", - "1.20.4" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6523/425/baguettelib-1.20.1-Forge-1.0.0.jar", - "id": "6523425", - "parent_id": "1264423", - "hashes": { - "sha1": "bb17d8ed796efce38eb8fcc72ec477f3373e6c9f", - "md5": "f27a8d6a333579d93a9881100d559b56" - }, - "required_dependencies": [], - "size": 26550, - "date_published": "2025-05-12T19:47:40.637Z" - }, { "type": "modrinth", "file_name": "baguettelib-1.20.1-Forge-1.0.0.jar", @@ -1446,6 +1422,27 @@ "required_dependencies": [], "size": 26550, "date_published": "2025-06-25T13:03:42.486510Z" + }, + { + "type": "curseforge", + "file_name": "baguettelib-1.20.1-Forge-1.1.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6909/482/baguettelib-1.20.1-Forge-1.1.0.jar", + "id": "6909482", + "parent_id": "1264423", + "hashes": { + "sha1": "140ea51f71e5f316e473354cdeeb0dbba5422632", + "md5": "74448bf96f648170cc03ab7bee6a6e3d" + }, + "required_dependencies": [], + "size": 30314, + "date_published": "2025-08-20T23:30:04.997Z" } ] }, @@ -1605,33 +1602,9 @@ "modrinth": "6VieRZiz" }, "files": [ - { - "type": "curseforge", - "file_name": "beneath-1.20.1-1.0.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6180/230/beneath-1.20.1-1.0.4.jar", - "id": "6180230", - "parent_id": "1113980", - "hashes": { - "sha1": "68fb9b544f582c45f7dc3402b2ae2f084d347a8b", - "md5": "a8b0315801867b2bc4762e14d3a1c0c7" - }, - "required_dependencies": [ - "302973" - ], - "size": 1500598, - "date_published": "2025-02-11T01:11:10.830Z" - }, { "type": "modrinth", - "file_name": "beneath-1.20.1-1.0.4.jar", + "file_name": "beneath-1.20.1-1.0.5.jar", "mc_versions": [ "1.20.1" ], @@ -1640,18 +1613,42 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/6VieRZiz/versions/BPS3Bb2s/beneath-1.20.1-1.0.4.jar", - "id": "BPS3Bb2s", + "url": "https://cdn.modrinth.com/data/6VieRZiz/versions/d0xgZnLe/beneath-1.20.1-1.0.5.jar", + "id": "d0xgZnLe", "parent_id": "6VieRZiz", "hashes": { - "sha512": "0e2ad7be3e389cb608fbe15c322de849ea05ebe890d8a015ff3e5dc9899cda90b1d1d73da25b57196ac0f0716ad9f6001aae8fe28f6851b1a1133c62267f8e45", - "sha1": "68fb9b544f582c45f7dc3402b2ae2f084d347a8b" + "sha512": "0eec3b25e7aebb8df74804d70a054c96e529f3d4cd437173219f891badef05d98996adcae387e6808e6489e18253aa73e6bd1193cfb9dcaf7ac26c92819e6bc8", + "sha1": "12edd937a9070a71e50dcb53fd757b30d115bc2a" }, "required_dependencies": [ "JaCEZUhg" ], - "size": 1500598, - "date_published": "2025-02-11T01:11:12.901644Z" + "size": 1500972, + "date_published": "2025-08-19T22:18:43.907020Z" + }, + { + "type": "curseforge", + "file_name": "beneath-1.20.1-1.0.5.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6905/461/beneath-1.20.1-1.0.5.jar", + "id": "6905461", + "parent_id": "1113980", + "hashes": { + "sha1": "12edd937a9070a71e50dcb53fd757b30d115bc2a", + "md5": "aeda5af6cf8575a816f7c4ea1630ca97" + }, + "required_dependencies": [ + "302973" + ], + "size": 1500972, + "date_published": "2025-08-19T22:18:40.447Z" } ] }, @@ -3153,37 +3150,9 @@ "modrinth": "pJGcKPh1" }, "files": [ - { - "type": "curseforge", - "file_name": "corpsecurioscompat-1.20.x-Forge-3.0.2.jar", - "mc_versions": [ - "1.20.2", - "1.20.3", - "1.20.1", - "1.20.4" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6616/671/corpsecurioscompat-1.20.x-Forge-3.0.2.jar", - "id": "6616671", - "parent_id": "1138130", - "hashes": { - "sha1": "946d6cc5055eac39900ff252cd2eb72caf95e4ac", - "md5": "f760be75a5b1c4c22c9327e72cd08a2c" - }, - "required_dependencies": [ - "309927", - "1264423", - "316582" - ], - "size": 12495, - "date_published": "2025-06-05T08:45:11.493Z" - }, { "type": "modrinth", - "file_name": "corpsecurioscompat-1.20.x-Forge-3.0.2.jar", + "file_name": "corpsecurioscompat-1.20.1-Forge-3.1.2.jar", "mc_versions": [ "1.20.1", "1.20.2", @@ -3194,18 +3163,44 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/pJGcKPh1/versions/WlXDIt4w/corpsecurioscompat-1.20.x-Forge-3.0.2.jar", - "id": "WlXDIt4w", + "url": "https://cdn.modrinth.com/data/pJGcKPh1/versions/oOV3E7PA/corpsecurioscompat-1.20.1-Forge-3.1.2.jar", + "id": "oOV3E7PA", "parent_id": "pJGcKPh1", "hashes": { - "sha512": "fd41651ff891977acfb2b74ea1738c3259435fdc38f887c8ec7073979faebda27adcd3d65cbb9b3fc98a17edd8df05800b5277ff3687ca0c72e2e4bb71f3be6e", - "sha1": "946d6cc5055eac39900ff252cd2eb72caf95e4ac" + "sha512": "f3a5ad7993bab522decefed9421002a130c5dae652e7e2b3c38a9afcf6dc14569ed00fd140a91fffb5e6baacde3eecb7ed0d0cc1222583a6d066be53c3dc726d", + "sha1": "6bffb8fd1ce4b0c7e504dc67271a05848f7d33a9" }, "required_dependencies": [ - "OfKzpbRU" + "WrpuIfhw", + "OfKzpbRU", + "vvuO3ImH" ], - "size": 12495, - "date_published": "2025-07-11T09:30:13.847826Z" + "size": 24680, + "date_published": "2025-08-19T16:40:42.144982Z" + }, + { + "type": "curseforge", + "file_name": "corpsecurioscompat-1.20.1-Forge-3.1.2.jar", + "mc_versions": [ + "1.20.2", + "1.20.3", + "1.20.1", + "1.20.4" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6898/69/corpsecurioscompat-1.20.1-Forge-3.1.2.jar", + "id": "6898069", + "parent_id": "1138130", + "hashes": { + "sha1": "6bffb8fd1ce4b0c7e504dc67271a05848f7d33a9", + "md5": "5e0ed6620f6576535e429ffe278442ef" + }, + "required_dependencies": [], + "size": 24680, + "date_published": "2025-08-17T21:25:40.290Z" } ] }, @@ -3547,27 +3542,6 @@ "modrinth": "kU1G12Nn" }, "files": [ - { - "type": "curseforge", - "file_name": "createaddition-1.20.1-1.3.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6306/951/createaddition-1.20.1-1.3.1.jar", - "id": "6306951", - "parent_id": "439890", - "hashes": { - "sha1": "0c408317b7c3bc3c7f7d5f6dbbb3ee106fa5f4fc", - "md5": "0abfc0f6db9558cba6eaee44266a4447" - }, - "required_dependencies": [], - "size": 1547196, - "date_published": "2025-03-15T13:17:38.737Z" - }, { "type": "modrinth", "file_name": "createaddition-1.20.1-1.3.1.jar", @@ -3590,6 +3564,29 @@ ], "size": 1547196, "date_published": "2025-03-22T16:14:26.357192Z" + }, + { + "type": "curseforge", + "file_name": "createaddition-1.20.1-1.3.2.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6901/922/createaddition-1.20.1-1.3.2.jar", + "id": "6901922", + "parent_id": "439890", + "hashes": { + "sha1": "41ea564e270effea8bad04b937fb30d2a3bb5053", + "md5": "0a70304b24fed06ef44470b613cdb251" + }, + "required_dependencies": [ + "328085" + ], + "size": 1583476, + "date_published": "2025-08-18T21:47:44.397Z" } ] }, @@ -5009,7 +5006,7 @@ "files": [ { "type": "modrinth", - "file_name": "everycomp-1.20-2.8.17-forge.jar", + "file_name": "everycomp-1.20-2.9.0-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5017,22 +5014,22 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/pztPAx2c/everycomp-1.20-2.8.17-forge.jar", - "id": "pztPAx2c", + "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/QeAScqwj/everycomp-1.20-2.9.0-forge.jar", + "id": "QeAScqwj", "parent_id": "eiktJyw1", "hashes": { - "sha512": "6608da2f4ac880573c5f434c75995a3a3e917c47189d2d8570e9c3e09113ba78844b8c96510402a7d198e6cfde4502287ba771dc9940b8490cd97b5dc880a425", - "sha1": "79ab372f4b6645e3bd9ad34948a8ad3afa37fed5" + "sha512": "e9677f60675a83f0d645c95503bdcede921d7a5b0ce513766b051b785519bb7191165381deaae1837c716de12458e2f13ef59820a72af2d36788e9ed1f5fca9a", + "sha1": "79b7d93cebf1aa77d9d0b244f196d426a3a71e59" }, "required_dependencies": [ "twkfQtEc" ], - "size": 2781819, - "date_published": "2025-08-14T08:05:13.713026Z" + "size": 2805521, + "date_published": "2025-08-21T08:37:42.008646Z" }, { "type": "curseforge", - "file_name": "everycomp-1.20-2.8.17-forge.jar", + "file_name": "everycomp-1.20-2.9.0-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5040,18 +5037,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6884/861/everycomp-1.20-2.8.17-forge.jar", - "id": "6884861", + "url": "https://edge.forgecdn.net/files/6910/551/everycomp-1.20-2.9.0-forge.jar", + "id": "6910551", "parent_id": "628539", "hashes": { - "sha1": "79ab372f4b6645e3bd9ad34948a8ad3afa37fed5", - "md5": "7d34a6136694fadaef8dc068e18a1455" + "sha1": "79b7d93cebf1aa77d9d0b244f196d426a3a71e59", + "md5": "3ef743fb5d8e8b445edaa56825616f44" }, "required_dependencies": [ "499980" ], - "size": 2781819, - "date_published": "2025-08-14T08:05:03.337Z" + "size": 2805521, + "date_published": "2025-08-21T08:37:31.970Z" } ] }, @@ -6712,7 +6709,7 @@ "files": [ { "type": "modrinth", - "file_name": "greate-0.0.50.jar", + "file_name": "greate-0.0.51.jar", "mc_versions": [ "1.20.1" ], @@ -6721,23 +6718,23 @@ "neoforge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/WqPWraSr/greate-0.0.50.jar", - "id": "WqPWraSr", + "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/uOZLaa3T/greate-0.0.51.jar", + "id": "uOZLaa3T", "parent_id": "8wDcQuht", "hashes": { - "sha512": "57ffbe121c93eb64b95ce66294c3a87e7df37a12c72d9496105690241479273dacc3efe3ee28fd825542156cd5226301021fab2fcdf4a28675cfafb77f4365ce", - "sha1": "c3fbad31a098c0e589260e2714724ec456de3f64" + "sha512": "d333c40a6e2433c6fc46b75979881c6b1f5ad33984968c57eef16cb9357cec35e056d63fc1fc2cfb9878498e8d8861ae0571dc733267dd99395026c2ec61b339", + "sha1": "663d459fae5b64775c79e361f8c34642c6202448" }, "required_dependencies": [ "LNytGWDc", "7tG215v7" ], - "size": 1500510, - "date_published": "2025-08-07T22:26:24.676945Z" + "size": 1500474, + "date_published": "2025-08-16T17:23:29.632692Z" }, { "type": "curseforge", - "file_name": "greate-0.0.50.jar", + "file_name": "greate-0.0.51.jar", "mc_versions": [ "1.20.1" ], @@ -6746,19 +6743,19 @@ "forge" ], "release_type": "alpha", - "url": "https://edge.forgecdn.net/files/6861/250/greate-0.0.50.jar", - "id": "6861250", + "url": "https://edge.forgecdn.net/files/6893/614/greate-0.0.51.jar", + "id": "6893614", "parent_id": "901996", "hashes": { - "sha1": "c3fbad31a098c0e589260e2714724ec456de3f64", - "md5": "99d378e8b1082de0378f283345cb1799" + "sha1": "663d459fae5b64775c79e361f8c34642c6202448", + "md5": "e6c1297fb76c8ada273142b1685e3253" }, "required_dependencies": [ "890405", "328085" ], - "size": 1500510, - "date_published": "2025-08-07T22:26:22.413Z" + "size": 1500474, + "date_published": "2025-08-16T17:23:28.067Z" } ] }, @@ -8940,7 +8937,7 @@ "files": [ { "type": "modrinth", - "file_name": "moonlight-1.20-2.16.1-forge.jar", + "file_name": "moonlight-1.20-2.16.5-forge.jar", "mc_versions": [ "1.20.1" ], @@ -8949,20 +8946,20 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/lByJnenL/moonlight-1.20-2.16.1-forge.jar", - "id": "lByJnenL", + "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/uiOJ4NEz/moonlight-1.20-2.16.5-forge.jar", + "id": "uiOJ4NEz", "parent_id": "twkfQtEc", "hashes": { - "sha512": "8a1b463c721568cdf6f197fc7aa6d3c9d11072c1f3b3d8e57402075a660b20293cab7b249654dd2c7ef34ffc88c23cda08ef78dcf0cba7b2be63a30083d45ef8", - "sha1": "17a8bbbdfd87869e7cac5ece8f3daaee380813a7" + "sha512": "c160493b99be1fab942f7eb64c491985d51a72c16dbda18c345fd14cbf8cfb0bd899c1b7627714e507f079a68bf1917b4d4e407340c2ff3b44359e1996e6c2d7", + "sha1": "461b979a7c1f100a17af4558910f34f259bb56b2" }, "required_dependencies": [], - "size": 1310673, - "date_published": "2025-08-15T09:47:04.798820Z" + "size": 1326648, + "date_published": "2025-08-19T05:34:44.417258Z" }, { "type": "curseforge", - "file_name": "moonlight-1.20-2.16.1-forge.jar", + "file_name": "moonlight-1.20-2.16.5-forge.jar", "mc_versions": [ "1.20.1" ], @@ -8971,16 +8968,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6888/940/moonlight-1.20-2.16.1-forge.jar", - "id": "6888940", + "url": "https://edge.forgecdn.net/files/6902/841/moonlight-1.20-2.16.5-forge.jar", + "id": "6902841", "parent_id": "499980", "hashes": { - "sha1": "17a8bbbdfd87869e7cac5ece8f3daaee380813a7", - "md5": "23ef17c141597aeed404c3e483e40161" + "sha1": "461b979a7c1f100a17af4558910f34f259bb56b2", + "md5": "d080ad63ce08e5c69785ab1227bc0af5" }, "required_dependencies": [], - "size": 1310673, - "date_published": "2025-08-15T09:46:55.940Z" + "size": 1326648, + "date_published": "2025-08-19T05:34:28.713Z" } ] }, @@ -13542,49 +13539,53 @@ "modrinth": "nWC3kyL3" }, "files": [ - { - "type": "curseforge", - "file_name": "wab-1.20.1-1.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6871/96/wab-1.20.1-1.3.0.jar", - "id": "6871096", - "parent_id": "1108604", - "hashes": { - "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7", - "md5": "190aa6671f0a42775ee89381a47369a9" - }, - "required_dependencies": [], - "size": 9916516, - "date_published": "2025-08-10T12:28:16.640Z" - }, { "type": "modrinth", - "file_name": "wab-1.20.1-1.3.0.jar", + "file_name": "wab-1.20.1-1.3.1.jar", "mc_versions": [ "1.20.1" ], "loaders": [ - "forge" + "forge", + "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/nWC3kyL3/versions/txtFU0oY/wab-1.20.1-1.3.0.jar", - "id": "txtFU0oY", + "url": "https://cdn.modrinth.com/data/nWC3kyL3/versions/cf1QAPDG/wab-1.20.1-1.3.1.jar", + "id": "cf1QAPDG", "parent_id": "nWC3kyL3", "hashes": { - "sha512": "216b256897bfa01671883aebd9f38dceb1077b8abff63a85f12f80ef800cb28d6b7bd8dd42c54ff928a587dd43d4ddc8fde7a8f45ec85459287bfabe578d4760", - "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7" + "sha512": "cc80da2f8bbc7c9780b4ecbbc135b236bac6deec26166bf7149bfc5c9989c21f2f5be8948491fbab8d200c51ca854ee742c70ef735a164b37869d559c8b6731c", + "sha1": "1262e27c352d303b608dbfd587d4231741d9c89f" }, "required_dependencies": [ "8BmcQJ2H" ], - "size": 9916516, - "date_published": "2025-08-12T15:03:58.487235Z" + "size": 9068035, + "date_published": "2025-08-21T12:47:19.839859Z" + }, + { + "type": "curseforge", + "file_name": "wab-1.20.1-1.3.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6911/60/wab-1.20.1-1.3.1.jar", + "id": "6911060", + "parent_id": "1108604", + "hashes": { + "sha1": "1262e27c352d303b608dbfd587d4231741d9c89f", + "md5": "f0c1ece64562ca523efb513e1e7c19c9" + }, + "required_dependencies": [ + "388172" + ], + "size": 9068035, + "date_published": "2025-08-21T12:44:33.350Z" } ] }, From 17828ff679b71ff2bf7e118afa9fea575d064a2e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 22:41:08 +0100 Subject: [PATCH 15/52] fixed broken water tag for making paper, added AA recipe for spring water --- kubejs/server_scripts/tfg/recipes.paper.js | 2 +- kubejs/server_scripts/tfg/recipes.space.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/recipes.paper.js b/kubejs/server_scripts/tfg/recipes.paper.js index b552a6e6b..8eeeb21ae 100644 --- a/kubejs/server_scripts/tfg/recipes.paper.js +++ b/kubejs/server_scripts/tfg/recipes.paper.js @@ -104,7 +104,7 @@ function registerTFGPapermakingRecipes(event) { .outputItem('tfg:soaked_hardwood_strip') .id('tfg:barrel/soak_hardwood_strip') event.recipes.gtceu.chemical_bath('tfg:chemical_bath/soak_hardwood_strips') - .inputFluids("#tfc:clean_water 100") + .inputFluids("#tfg:clean_water 100") .itemInputs('tfg:hardwood_strip') .itemOutputs('tfg:soaked_hardwood_strip') .duration(200) diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index d92daedef..494d4dfd4 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -97,6 +97,14 @@ function registerTFGSpaceRecipes(event) { .addDataString("fluidA", "minecraft:lava") .outputFluids(Fluid.of("minecraft:lava", 1000)) + event.recipes.gtceu.aqueous_accumulator('spring_water') + .circuit(aaCircuit++) + .dimension('minecraft:overworld') + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) + .addDataString("fluidA", "tfc:spring_water") + .outputFluids(Fluid.of("tfc:spring_water", 1000)) + // Plants - Can't use the default builder here because fertiliser is much harder to get on the moon, // and we're using helium-3 as the fertiliser From fea8530ada1cbdd817479089a2551e197b2228aa Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:17:27 +0100 Subject: [PATCH 16/52] added higher tier greg machines --- CHANGELOG.md | 2 + .../blockstates/iv_aqueous_accumulator.json | 19 ++++ .../assets/tfg/blockstates/iv_food_oven.json | 19 ++++ .../tfg/blockstates/iv_food_processor.json | 19 ++++ .../tfg/blockstates/iv_food_refrigerator.json | 19 ++++ .../tfg/blockstates/iv_gas_pressurizer.json | 19 ++++ .../blockstates/luv_aqueous_accumulator.json | 19 ++++ .../assets/tfg/blockstates/luv_food_oven.json | 19 ++++ .../tfg/blockstates/luv_food_processor.json | 19 ++++ .../tfg/blockstates/luv_gas_pressurizer.json | 19 ++++ .../blockstates/uv_aqueous_accumulator.json | 19 ++++ .../assets/tfg/blockstates/uv_food_oven.json | 19 ++++ .../tfg/blockstates/uv_food_processor.json | 19 ++++ .../tfg/blockstates/uv_gas_pressurizer.json | 19 ++++ .../blockstates/zpm_aqueous_accumulator.json | 19 ++++ .../assets/tfg/blockstates/zpm_food_oven.json | 19 ++++ .../tfg/blockstates/zpm_food_processor.json | 19 ++++ .../tfg/blockstates/zpm_gas_pressurizer.json | 19 ++++ kubejs/assets/tfg/lang/en_us.json | 24 ++++- .../machines/iv_aqueous_accumulator.json | 51 +++++++++ .../models/block/machines/iv_food_oven.json | 67 ++++++++++++ .../block/machines/iv_food_processor.json | 67 ++++++++++++ .../block/machines/iv_food_refrigerator.json | 67 ++++++++++++ .../block/machines/iv_gas_pressurizer.json | 67 ++++++++++++ .../machines/luv_aqueous_accumulator.json | 51 +++++++++ .../models/block/machines/luv_food_oven.json | 67 ++++++++++++ .../block/machines/luv_food_processor.json | 67 ++++++++++++ .../block/machines/luv_gas_pressurizer.json | 67 ++++++++++++ .../machines/uv_aqueous_accumulator.json | 51 +++++++++ .../models/block/machines/uv_food_oven.json | 67 ++++++++++++ .../block/machines/uv_food_processor.json | 67 ++++++++++++ .../block/machines/uv_gas_pressurizer.json | 67 ++++++++++++ .../machines/zpm_aqueous_accumulator.json | 51 +++++++++ .../models/block/machines/zpm_food_oven.json | 67 ++++++++++++ .../block/machines/zpm_food_processor.json | 67 ++++++++++++ .../block/machines/zpm_gas_pressurizer.json | 67 ++++++++++++ .../models/item/iv_aqueous_accumulator.json | 3 + .../assets/tfg/models/item/iv_food_oven.json | 3 + .../tfg/models/item/iv_food_processor.json | 3 + .../tfg/models/item/iv_food_refrigerator.json | 3 + .../tfg/models/item/iv_gas_pressurizer.json | 3 + .../models/item/luv_aqueous_accumulator.json | 3 + .../assets/tfg/models/item/luv_food_oven.json | 3 + .../tfg/models/item/luv_food_processor.json | 3 + .../tfg/models/item/luv_gas_pressurizer.json | 3 + .../models/item/uv_aqueous_accumulator.json | 3 + .../assets/tfg/models/item/uv_food_oven.json | 3 + .../tfg/models/item/uv_food_processor.json | 3 + .../tfg/models/item/uv_gas_pressurizer.json | 3 + .../models/item/zpm_aqueous_accumulator.json | 3 + .../assets/tfg/models/item/zpm_food_oven.json | 3 + .../tfg/models/item/zpm_food_processor.json | 3 + .../tfg/models/item/zpm_gas_pressurizer.json | 3 + kubejs/server_scripts/greate/recipes.js | 100 +++++++++++++----- kubejs/server_scripts/tfc/recipes.machines.js | 8 ++ kubejs/server_scripts/tfg/recipes.food.js | 33 +++--- .../vintage_improvements/recipes.js | 8 ++ kubejs/startup_scripts/greate/constants.js | 5 - 58 files changed, 1579 insertions(+), 50 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/iv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/blockstates/iv_food_oven.json create mode 100644 kubejs/assets/tfg/blockstates/iv_food_processor.json create mode 100644 kubejs/assets/tfg/blockstates/iv_food_refrigerator.json create mode 100644 kubejs/assets/tfg/blockstates/iv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/blockstates/luv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/blockstates/luv_food_oven.json create mode 100644 kubejs/assets/tfg/blockstates/luv_food_processor.json create mode 100644 kubejs/assets/tfg/blockstates/luv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/blockstates/uv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/blockstates/uv_food_oven.json create mode 100644 kubejs/assets/tfg/blockstates/uv_food_processor.json create mode 100644 kubejs/assets/tfg/blockstates/uv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/blockstates/zpm_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/blockstates/zpm_food_oven.json create mode 100644 kubejs/assets/tfg/blockstates/zpm_food_processor.json create mode 100644 kubejs/assets/tfg/blockstates/zpm_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_food_oven.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_food_processor.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_food_refrigerator.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/block/machines/luv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/block/machines/luv_food_oven.json create mode 100644 kubejs/assets/tfg/models/block/machines/luv_food_processor.json create mode 100644 kubejs/assets/tfg/models/block/machines/luv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/block/machines/uv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/block/machines/uv_food_oven.json create mode 100644 kubejs/assets/tfg/models/block/machines/uv_food_processor.json create mode 100644 kubejs/assets/tfg/models/block/machines/uv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/block/machines/zpm_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/block/machines/zpm_food_oven.json create mode 100644 kubejs/assets/tfg/models/block/machines/zpm_food_processor.json create mode 100644 kubejs/assets/tfg/models/block/machines/zpm_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/item/iv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/item/iv_food_oven.json create mode 100644 kubejs/assets/tfg/models/item/iv_food_processor.json create mode 100644 kubejs/assets/tfg/models/item/iv_food_refrigerator.json create mode 100644 kubejs/assets/tfg/models/item/iv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/item/luv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/item/luv_food_oven.json create mode 100644 kubejs/assets/tfg/models/item/luv_food_processor.json create mode 100644 kubejs/assets/tfg/models/item/luv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/item/uv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/item/uv_food_oven.json create mode 100644 kubejs/assets/tfg/models/item/uv_food_processor.json create mode 100644 kubejs/assets/tfg/models/item/uv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/item/zpm_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/item/zpm_food_oven.json create mode 100644 kubejs/assets/tfg/models/item/zpm_food_processor.json create mode 100644 kubejs/assets/tfg/models/item/zpm_gas_pressurizer.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 422287bb2..68f7920eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ - Converted custom tooltips to lang strings for translations (#1663) @Redeix - Removed energy P2P (#1661) @TomPlop @BlueBoat29 - Fixed grammar on death messages and added some new ones (#1642) @vdegans +- Added IV fridge, and IV-UV aqueous accumulator, food processor, food oven, and gas compressor machines @Pyritie +- Added machine recipes for the wrought iron grill @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/assets/tfg/blockstates/iv_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/iv_aqueous_accumulator.json new file mode 100644 index 000000000..1a8dadb17 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/iv_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/iv_food_oven.json b/kubejs/assets/tfg/blockstates/iv_food_oven.json new file mode 100644 index 000000000..8b41ff867 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/iv_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/iv_food_processor.json b/kubejs/assets/tfg/blockstates/iv_food_processor.json new file mode 100644 index 000000000..d47739009 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/iv_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/iv_food_refrigerator.json b/kubejs/assets/tfg/blockstates/iv_food_refrigerator.json new file mode 100644 index 000000000..3d07a9c71 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_food_refrigerator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_food_refrigerator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_food_refrigerator" + }, + "facing=south": { + "model": "tfg:block/machines/iv_food_refrigerator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_food_refrigerator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/iv_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/iv_gas_pressurizer.json new file mode 100644 index 000000000..7e2b4b1dd --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/iv_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/luv_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/luv_aqueous_accumulator.json new file mode 100644 index 000000000..212115d36 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/luv_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/luv_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/luv_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/luv_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/luv_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/luv_food_oven.json b/kubejs/assets/tfg/blockstates/luv_food_oven.json new file mode 100644 index 000000000..8538c43e1 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/luv_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/luv_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/luv_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/luv_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/luv_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/luv_food_processor.json b/kubejs/assets/tfg/blockstates/luv_food_processor.json new file mode 100644 index 000000000..0fea62071 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/luv_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/luv_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/luv_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/luv_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/luv_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/luv_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/luv_gas_pressurizer.json new file mode 100644 index 000000000..8bc16436f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/luv_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/luv_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/luv_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/luv_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/luv_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/uv_aqueous_accumulator.json new file mode 100644 index 000000000..bdc914afb --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/uv_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/uv_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/uv_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/uv_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_food_oven.json b/kubejs/assets/tfg/blockstates/uv_food_oven.json new file mode 100644 index 000000000..0a6271e09 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/uv_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/uv_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/uv_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/uv_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_food_processor.json b/kubejs/assets/tfg/blockstates/uv_food_processor.json new file mode 100644 index 000000000..169a81e2d --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/uv_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/uv_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/uv_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/uv_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/uv_gas_pressurizer.json new file mode 100644 index 000000000..66213cd3c --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/uv_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/uv_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/uv_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/uv_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/zpm_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/zpm_aqueous_accumulator.json new file mode 100644 index 000000000..6b0ae1def --- /dev/null +++ b/kubejs/assets/tfg/blockstates/zpm_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/zpm_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/zpm_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/zpm_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/zpm_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/zpm_food_oven.json b/kubejs/assets/tfg/blockstates/zpm_food_oven.json new file mode 100644 index 000000000..509ec3c6e --- /dev/null +++ b/kubejs/assets/tfg/blockstates/zpm_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/zpm_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/zpm_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/zpm_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/zpm_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/zpm_food_processor.json b/kubejs/assets/tfg/blockstates/zpm_food_processor.json new file mode 100644 index 000000000..7f3d2e2a9 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/zpm_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/zpm_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/zpm_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/zpm_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/zpm_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/zpm_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/zpm_gas_pressurizer.json new file mode 100644 index 000000000..d73796f96 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/zpm_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/zpm_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/zpm_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/zpm_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/zpm_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index f88883ad9..cae8874f2 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -199,30 +199,52 @@ "block.tfg.mv_aqueous_accumulator": "§bAdvanced Aqueous Accumulator§r", "block.tfg.hv_aqueous_accumulator": "§6Advanced Aqueous Accumulator II§r", "block.tfg.ev_aqueous_accumulator": "§5Advanced Aqueous Accumulator III§r", + "block.tfg.iv_aqueous_accumulator": "§9Elite Aqueous Accumulator§r", + "block.tfg.luv_aqueous_accumulator": "§dElite Aqueous Accumulator II§r", + "block.tfg.zpm_aqueous_accumulator": "§cElite Aqueous Accumulator III§r", + "block.tfg.uv_aqueous_accumulator": "§3Ultimate Aqueous Accumulator§r", "block.tfg.electric_greenhouse": "Electric Greenhouse", "block.tfg.lv_food_processor": "Basic Food Processor", "block.tfg.mv_food_processor": "§bAdvanced Food Processor§r", "block.tfg.hv_food_processor": "§6Advanced Food Processor II§r", "block.tfg.ev_food_processor": "§5Advanced Food Processor III§r", + "block.tfg.iv_food_processor": "§9Elite Food Processor§r", + "block.tfg.luv_food_processor": "§dElite Food Processor II§r", + "block.tfg.zpm_food_processor": "§cElite Food Processor III§r", + "block.tfg.uv_food_processor": "§3Ultimate Food Processor§r", "block.tfg.lv_food_oven": "Basic Electric Oven", "block.tfg.mv_food_oven": "§bAdvanced Electric Oven§r", "block.tfg.hv_food_oven": "§6Advanced Electric Oven II§r", "block.tfg.ev_food_oven": "§5Advanced Electric Oven III§r", + "block.tfg.iv_food_oven": "§9Elite Electric Oven§r", + "block.tfg.luv_food_oven": "§dElite Electric Oven II§r", + "block.tfg.zpm_food_oven": "§cElite Electric Oven III§r", + "block.tfg.uv_food_oven": "§3Ultimate Electric Oven§r", "block.tfg.lv_food_refrigerator": "Basic Refrigerator", "block.tfg.mv_food_refrigerator": "§bAdvanced Refrigerator", "block.tfg.hv_food_refrigerator": "§6Advanced Refrigerator II§r", "block.tfg.ev_food_refrigerator": "§5Advanced Refrigerator III§r", + "block.tfg.iv_food_refrigerator": "§9Elite Refrigerator§r", "block.tfg.lv_gas_pressurizer": "Basic Gas Pressurizer", "block.tfg.mv_gas_pressurizer": "§bAdvanced Gas Pressurizer§r", "block.tfg.hv_gas_pressurizer": "§6Advanced Gas Pressurizer II§r", "block.tfg.ev_gas_pressurizer": "§5Advanced Gas Pressurizer III§r", + "block.tfg.iv_gas_pressurizer": "§9Elite Gas Pressurizer§r", + "block.tfg.luv_gas_pressurizer": "§dElite Gas Pressurizer II§r", + "block.tfg.zpm_gas_pressurizer": "§cElite Gas Pressurizer III§r", + "block.tfg.uv_gas_pressurizer": "§3Ultimate Gas Pressurizer III§r", "block.tfg.semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", "block.tfg.grass.mars_dirt": "Martian Dirt", "block.tfg.grass.mars_farmland": "Martian Farmland", "block.tfg.grass.amber_mycelium": "Amber Mycelium", "block.tfg.grass.rusticus_mycelium": "Rusticus Mycelium", "block.tfg.grass.sangnum_mycelium": "Sangnum Mycelium", - "block.tfg.sapling.glacian": "Glacian Mushroom", + "block.tfg.saplings.crimson": "Crimson Fungus", + "block.tfg.saplings.warped": "Warped Fungus", + "block.tfg.saplings.alphacene": "Alphacene Mushroom", + "block.tfg.saplings.aeronos": "Aeronos Mushroom", + "block.tfg.saplings.strophar": "Strophar Mushroom", + "block.tfg.saplings.glacian": "Glacian Mushroom", "block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator", "block.tfg.superconductor_coil_large": "Large Superconductor Coil", "block.tfg.superconductor_coil_small": "Small Superconductor Coil", diff --git a/kubejs/assets/tfg/models/block/machines/iv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/iv_aqueous_accumulator.json new file mode 100644 index 000000000..3681fa2f6 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/iv_food_oven.json b/kubejs/assets/tfg/models/block/machines/iv_food_oven.json new file mode 100644 index 000000000..af85a0b4e --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/iv_food_processor.json b/kubejs/assets/tfg/models/block/machines/iv_food_processor.json new file mode 100644 index 000000000..a005c0263 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/iv_food_refrigerator.json b/kubejs/assets/tfg/models/block/machines/iv_food_refrigerator.json new file mode 100644 index 000000000..07b171bd5 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_food_refrigerator.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_food_refrigerator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/iv_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/iv_gas_pressurizer.json new file mode 100644 index 000000000..6d1075bae --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/luv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/luv_aqueous_accumulator.json new file mode 100644 index 000000000..d4e377c06 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/luv_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:luv_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/luv_food_oven.json b/kubejs/assets/tfg/models/block/machines/luv_food_oven.json new file mode 100644 index 000000000..9789d0959 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/luv_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:luv_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/luv_food_processor.json b/kubejs/assets/tfg/models/block/machines/luv_food_processor.json new file mode 100644 index 000000000..7d6bf20eb --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/luv_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:luv_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/luv_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/luv_gas_pressurizer.json new file mode 100644 index 000000000..bafb1a478 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/luv_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:luv_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/uv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/uv_aqueous_accumulator.json new file mode 100644 index 000000000..fdcbfef13 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/uv_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/uv_food_oven.json b/kubejs/assets/tfg/models/block/machines/uv_food_oven.json new file mode 100644 index 000000000..d213b4684 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/uv_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/uv_food_processor.json b/kubejs/assets/tfg/models/block/machines/uv_food_processor.json new file mode 100644 index 000000000..1f6ac4517 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/uv_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/uv_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/uv_gas_pressurizer.json new file mode 100644 index 000000000..5e040aeeb --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/uv_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/zpm_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/zpm_aqueous_accumulator.json new file mode 100644 index 000000000..ca2000453 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/zpm_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:zpm_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/zpm_food_oven.json b/kubejs/assets/tfg/models/block/machines/zpm_food_oven.json new file mode 100644 index 000000000..eb110cab3 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/zpm_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:zpm_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/zpm_food_processor.json b/kubejs/assets/tfg/models/block/machines/zpm_food_processor.json new file mode 100644 index 000000000..11ec6b8f6 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/zpm_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:zpm_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/zpm_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/zpm_gas_pressurizer.json new file mode 100644 index 000000000..b3e4e1e30 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/zpm_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:zpm_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/iv_aqueous_accumulator.json new file mode 100644 index 000000000..dbb94dd36 --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_food_oven.json b/kubejs/assets/tfg/models/item/iv_food_oven.json new file mode 100644 index 000000000..e8209881a --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_food_processor.json b/kubejs/assets/tfg/models/item/iv_food_processor.json new file mode 100644 index 000000000..cc431f368 --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_food_refrigerator.json b/kubejs/assets/tfg/models/item/iv_food_refrigerator.json new file mode 100644 index 000000000..8a5905cbe --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_food_refrigerator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_food_refrigerator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_gas_pressurizer.json b/kubejs/assets/tfg/models/item/iv_gas_pressurizer.json new file mode 100644 index 000000000..27d67efb9 --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luv_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/luv_aqueous_accumulator.json new file mode 100644 index 000000000..8296680df --- /dev/null +++ b/kubejs/assets/tfg/models/item/luv_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/luv_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luv_food_oven.json b/kubejs/assets/tfg/models/item/luv_food_oven.json new file mode 100644 index 000000000..17ce5e51f --- /dev/null +++ b/kubejs/assets/tfg/models/item/luv_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/luv_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luv_food_processor.json b/kubejs/assets/tfg/models/item/luv_food_processor.json new file mode 100644 index 000000000..f24b74800 --- /dev/null +++ b/kubejs/assets/tfg/models/item/luv_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/luv_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luv_gas_pressurizer.json b/kubejs/assets/tfg/models/item/luv_gas_pressurizer.json new file mode 100644 index 000000000..191817577 --- /dev/null +++ b/kubejs/assets/tfg/models/item/luv_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/luv_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/uv_aqueous_accumulator.json new file mode 100644 index 000000000..69628c0ed --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/uv_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_food_oven.json b/kubejs/assets/tfg/models/item/uv_food_oven.json new file mode 100644 index 000000000..ab8b6e79b --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/uv_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_food_processor.json b/kubejs/assets/tfg/models/item/uv_food_processor.json new file mode 100644 index 000000000..91aa6746f --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/uv_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_gas_pressurizer.json b/kubejs/assets/tfg/models/item/uv_gas_pressurizer.json new file mode 100644 index 000000000..d8db0dce1 --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/uv_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/zpm_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/zpm_aqueous_accumulator.json new file mode 100644 index 000000000..69e0de4c5 --- /dev/null +++ b/kubejs/assets/tfg/models/item/zpm_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/zpm_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/zpm_food_oven.json b/kubejs/assets/tfg/models/item/zpm_food_oven.json new file mode 100644 index 000000000..1bc502636 --- /dev/null +++ b/kubejs/assets/tfg/models/item/zpm_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/zpm_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/zpm_food_processor.json b/kubejs/assets/tfg/models/item/zpm_food_processor.json new file mode 100644 index 000000000..bffcb9187 --- /dev/null +++ b/kubejs/assets/tfg/models/item/zpm_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/zpm_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/zpm_gas_pressurizer.json b/kubejs/assets/tfg/models/item/zpm_gas_pressurizer.json new file mode 100644 index 000000000..f3ffa362a --- /dev/null +++ b/kubejs/assets/tfg/models/item/zpm_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/zpm_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index f51c85dc5..c82bbbdc5 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -704,13 +704,6 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/steel' }).id('gtceu:shaped/steel_whisk') - event.recipes.gtceu.assembler('gtceu:steel_whisk') - .itemInputs('#forge:rings/steel', '4x #forge:rods/long/steel') - .itemOutputs('gtceu:steel_whisk') - .circuit(2) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.extruder('gtceu:steel_whisk') .itemInputs('4x #forge:ingots/steel') .notConsumable('tfg:whisk_extruder_mold') @@ -729,13 +722,6 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/aluminium' }).id('gtceu:shaped/aluminium_whisk') - event.recipes.gtceu.assembler('gtceu:aluminium_whisk') - .itemInputs('#forge:rings/aluminium', '4x #forge:rods/long/aluminium') - .itemOutputs('gtceu:aluminium_whisk') - .circuit(2) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.extruder('gtceu:aluminium_whisk') .itemInputs('4x #forge:ingots/aluminium') .notConsumable('tfg:whisk_extruder_mold') @@ -754,13 +740,6 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/stainless_steel' }).id('gtceu:shaped/stainless_steel_whisk') - event.recipes.gtceu.assembler('gtceu:stainless_steel_whisk') - .itemInputs('#forge:rings/stainless_steel', '4x #forge:rods/long/stainless_steel') - .itemOutputs('gtceu:stainless_steel_whisk') - .circuit(2) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.extruder('gtceu:stainless_steel_whisk') .itemInputs('4x #forge:ingots/stainless_steel') .notConsumable('tfg:whisk_extruder_mold') @@ -779,13 +758,6 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/titanium' }).id('gtceu:shaped/titanium_whisk') - event.recipes.gtceu.assembler('gtceu:titanium_whisk') - .itemInputs('#forge:rings/titanium', '4x #forge:rods/long/titanium') - .itemOutputs('gtceu:titanium_whisk') - .circuit(2) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.extruder('gtceu:titanium_whisk') .itemInputs('4x #forge:ingots/titanium') .notConsumable('tfg:whisk_extruder_mold') @@ -793,6 +765,78 @@ function registerGreateRecipes(event) { .duration(GTMaterials.Titanium.getMass() * 3) .EUt(GTValues.VA[GTValues.MV]) + event.shaped('gtceu:tungsten_steel_whisk', [ + 'ABC', + 'D D', + 'D D' + ], { + A: '#forge:tools/hammers', + B: '#forge:rings/tungsten_steel', + C: '#forge:tools/wrenches', + D: '#forge:rods/long/tungsten_steel' + }).id('gtceu:shaped/tungsten_steel_whisk') + + event.recipes.gtceu.extruder('gtceu:tungsten_steel_whisk') + .itemInputs('4x #forge:ingots/tungsten_steel') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:tungsten_steel_whisk') + .duration(GTMaterials.TungstenSteel.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + + event.shaped('gtceu:rhodium_plated_palladium_whisk', [ + 'ABC', + 'D D', + 'D D' + ], { + A: '#forge:tools/hammers', + B: '#forge:rings/rhodium_plated_palladium', + C: '#forge:tools/wrenches', + D: '#forge:rods/long/rhodium_plated_palladium' + }).id('gtceu:shaped/rhodium_plated_palladium_whisk') + + event.recipes.gtceu.extruder('gtceu:rhodium_plated_palladium_whisk') + .itemInputs('4x #forge:ingots/rhodium_plated_palladium') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:rhodium_plated_palladium_whisk') + .duration(GTMaterials.RhodiumPlatedPalladium.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + + event.shaped('gtceu:naquadah_alloy_whisk', [ + 'ABC', + 'D D', + 'D D' + ], { + A: '#forge:tools/hammers', + B: '#forge:rings/naquadah_alloy', + C: '#forge:tools/wrenches', + D: '#forge:rods/long/naquadah_alloy' + }).id('gtceu:shaped/naquadah_alloy_whisk') + + event.recipes.gtceu.extruder('gtceu:naquadah_alloy_whisk') + .itemInputs('4x #forge:ingots/naquadah_alloy') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:naquadah_alloy_whisk') + .duration(GTMaterials.NaquadahAlloy.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + + event.shaped('gtceu:darmstadtium_whisk', [ + 'ABC', + 'D D', + 'D D' + ], { + A: '#forge:tools/hammers', + B: '#forge:rings/darmstadtium', + C: '#forge:tools/wrenches', + D: '#forge:rods/long/darmstadtium' + }).id('gtceu:shaped/darmstadtium_whisk') + + event.recipes.gtceu.extruder('gtceu:darmstadtium_whisk') + .itemInputs('4x #forge:ingots/darmstadtium') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:darmstadtium_whisk') + .duration(GTMaterials.Darmstadtium.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + // #endregion // #region Presses diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index c9e5cd79b..7402f708c 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -419,4 +419,12 @@ function registerTFCMachineRecipes(event) { processingTime: 50 }).id(`tfg:vi/lathe/stripping_${wood}_wood`) }) + + + event.recipes.gtceu.extruder('tfg:wrought_iron_grill_electric_only') + .itemInputs('2x #forge:plates/wrought_iron') + .notConsumable('tfg:large_casing_extruder_mold') + .itemOutputs('tfc:wrought_iron_grill') + .duration(60) + .EUt(8) } diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index a99006432..b57371354 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -1088,6 +1088,7 @@ function registerTFGFoodRecipes(event) { event.remove({id: 'gtceu:shaped/mv_food_refrigerator'}) event.remove({id: 'gtceu:shaped/hv_food_refrigerator'}) event.remove({id: 'gtceu:shaped/ev_food_refrigerator'}) + event.remove({id: 'gtceu:shaped/iv_food_refrigerator'}) event.recipes.gtceu.assembler('tfg:assembler/mv_food_refrigerator') .itemInputs( @@ -1128,12 +1129,27 @@ function registerTFGFoodRecipes(event) { 'gtceu:ev_hermetic_casing', '#gtceu:circuits/ev' ) - .inputFluids(Fluid.of('tfg:isobutane', 6000)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 6000)) .itemOutputs('1x tfg:ev_food_refrigerator') .duration(200) .circuit(7) .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.assembler('tfg:assembler/iv_food_refrigerator') + .itemInputs( + ChemicalHelper.get(TagPrefix.cableGtSingle, GTMaterials.Platinum, 2), + ChemicalHelper.get(TagPrefix.plate, GTMaterials.Polyethylene, 2), + ChemicalHelper.get(TagPrefix.rotor, GTMaterials.Titanium, 1), + '2x gtceu:iv_electric_pump', + 'gtceu:iv_hermetic_casing', + '#gtceu:circuits/iv' + ) + .inputFluids(Fluid.of('tfg:solar_coolant_tier2', 6000)) + .itemOutputs('1x tfg:iv_food_refrigerator') + .duration(200) + .circuit(7) + .EUt(GTValues.VA[GTValues.LV]) + event.shaped('tfg:electric_greenhouse', [ 'ABA', 'CDC', @@ -1144,19 +1160,4 @@ function registerTFGFoodRecipes(event) { C: 'tfc:compost', D: 'gtceu:steel_machine_casing' }).id('tfg:shaped/electric_greenhouse') - - // Tweaks to the machine crafts that are more annoying to do in java - event.replaceInput({id: 'gtceu:shaped/lv_food_processor'}, 'gtceu:lv_electric_piston', 'gtceu:steel_whisk') - event.replaceInput({id: 'gtceu:shaped/mv_food_processor'}, 'gtceu:mv_electric_piston', 'gtceu:aluminium_whisk') - event.replaceInput({id: 'gtceu:shaped/hv_food_processor'}, 'gtceu:hv_electric_piston', 'gtceu:stainless_steel_whisk') - event.replaceInput({id: 'gtceu:shaped/ev_food_processor'}, 'gtceu:ev_electric_piston', 'gtceu:titanium_whisk') - - event.replaceInput({id: 'gtceu:shaped/lv_food_oven'}, 'gtceu:lv_electric_piston', '#tfg:metal_bars') - event.replaceInput({id: 'gtceu:shaped/mv_food_oven'}, 'gtceu:mv_electric_piston', '#tfg:metal_bars') - event.replaceInput({id: 'gtceu:shaped/hv_food_oven'}, 'gtceu:hv_electric_piston', '#tfg:metal_bars') - event.replaceInput({id: 'gtceu:shaped/ev_food_oven'}, 'gtceu:ev_electric_piston', '#tfg:metal_bars') - - event.replaceInput({id: 'gtceu:shaped/mv_food_refrigerator'}, 'gtceu:mv_machine_hull', 'gtceu:mv_hermetic_casing') - event.replaceInput({id: 'gtceu:shaped/hv_food_refrigerator'}, 'gtceu:hv_machine_hull', 'gtceu:hv_hermetic_casing') - event.replaceInput({id: 'gtceu:shaped/ev_food_refrigerator'}, 'gtceu:ev_machine_hull', 'gtceu:ev_hermetic_casing') } diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index f92a66ae4..10bd2cfb2 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -717,6 +717,14 @@ function registerVintageImprovementsRecipes(event) { processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/curving/sprinkler`) + event.custom({ + type: 'vintageimprovements:curving', + ingredients: [{ tag: 'forge:double_plates/wrought_iron' }], + itemAsHead: 'tfg:large_casing_extruder_mold', + results: [{ item: 'tfc:wrought_iron_grill' }], + processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER + }).id(`tfg:vi/curving/wrought_iron_grill`) + // #endregion } diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index 28550ff3f..9d6c668e9 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -14,12 +14,7 @@ global.GREATE_DISABLED_ITEMS = [ 'gtceu:darmstadtium_alloy', 'gtceu:neutronium_alloy', - 'gtceu:tungsten_steel_whisk', - 'gtceu:rhodium_plated_palladium_whisk', - 'gtceu:naquadah_alloy_whisk', - 'gtceu:darmstadtium_whisk', 'gtceu:neutronium_whisk', - 'greate:polybenzimidazole_belt_connector', 'greate:polytetrafluoroethylene_belt_connector', From dec69df3b99d6d895404bd81a741a2d3406da949 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:23:51 +0100 Subject: [PATCH 17/52] mods can't even name themselves properly smh --- kubejs/startup_scripts/main_startup_script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 9a90f4b81..49568b2de 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -80,3 +80,4 @@ GTCEuStartupEvents.registry("gtceu:element", event => { Platform.mods.primitive_creatures.name = "Primitive Creatures"; Platform.mods.tfg.name = "TerraFirmaGreg"; Platform.mods.kubejs.name = "TerraFirmaGreg"; +Platform.mods.wan_ancient_beasts.name = "Wan's Ancient Beasts"; From 37ef72ee0152eb15b8bc84656892cbfe250138b1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:32:42 +0100 Subject: [PATCH 18/52] shipping container dye/bleach recipes --- CHANGELOG.md | 1 + kubejs/server_scripts/createdeco/recipes.js | 32 +++++++++++++++++++++ kubejs/server_scripts/createdeco/tags.js | 8 +++--- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68f7920eb..89aec2d1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Fixed grammar on death messages and added some new ones (#1642) @vdegans - Added IV fridge, and IV-UV aqueous accumulator, food processor, food oven, and gas compressor machines @Pyritie - Added machine recipes for the wrought iron grill @Pyritie +- Added recipes for redyeing/bleaching shipping containers (#1631) @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 7694e779e..f51252196 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -466,4 +466,36 @@ const registerCreatedecoRecipes = (event) => { }).id('tfg:createdeco/shaped/industrial_iron_ladder') // #endregion + + // #region Shipping Containers + + global.MINECRAFT_DYE_NAMES.forEach(color => { + event.remove({ id: `createdeco:${color}_shipping_container_from_dyeing_vaults` }) + + event.recipes.gtceu.chemical_bath(`createdeco:${color}_shipping_container`) + .itemInputs('create:item_vault') + .inputFluids(Fluid.of(`tfc:${color}_dye`, 144)) + .itemOutputs(`createdeco:${color}_shipping_container`) + .duration(100) + .EUt(16) + .category(GTRecipeCategories.CHEM_DYES); + + event.recipes.gtceu.chemical_bath(`createdeco:${color}_shipping_container_recolor`) + .itemInputs('#createdeco:shipping_containers') + .inputFluids(Fluid.of(`tfc:${color}_dye`, 144)) + .itemOutputs(`createdeco:${color}_shipping_container`) + .duration(100) + .EUt(16) + .category(GTRecipeCategories.CHEM_DYES); + }) + + event.recipes.gtceu.chemical_bath(`createdeco:bleach_shipping_container`) + .itemInputs('#createdeco:shipping_containers') + .inputFluids(Fluid.of('gtceu:chlorine', 144)) + .itemOutputs('create:item_vault') + .duration(100) + .EUt(16) + .category(GTRecipeCategories.CHEM_DYES); + + // #endregion }; diff --git a/kubejs/server_scripts/createdeco/tags.js b/kubejs/server_scripts/createdeco/tags.js index 1ebab2044..9ab63b54e 100644 --- a/kubejs/server_scripts/createdeco/tags.js +++ b/kubejs/server_scripts/createdeco/tags.js @@ -4,17 +4,14 @@ const metalBars = ['andesite', 'brass', 'iron', 'copper', 'industrial_iron', 'zi const registerCreateDecoItemTags = (event) => { - //#region Hidden Items global.CREATEDECO_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }); - //#endregion event.remove('createdeco:internal/blocks/iron_blocks', 'minecraft:iron_block') event.remove('createdeco:internal/blocks/industrial_iron_blocks', 'create:industrial_iron_block') - //#region Apply Tags metalBars.forEach(metalBars => { event.add('tfg:metal_bars', `createdeco:${metalBars}_bars`) event.add('tfg:metal_bars', `createdeco:${metalBars}_bars_overlay`) @@ -53,7 +50,10 @@ const registerCreateDecoItemTags = (event) => { event.add("createdeco:internal/blocks/industrial_iron_blocks", "#forge:storage_blocks/steel") event.add("createdeco:internal/blocks/zinc_blocks", "#forge:storage_blocks/zinc") event.add("createdeco:internal/blocks/andesite_blocks", "#forge:storage_blocks/tin_alloy") - //#endregion + + global.MINECRAFT_DYE_NAMES.forEach(color => { + event.add('createdeco:shipping_containers', `createdeco:${color}_shipping_container`) + }) }; const registerCreateDecoBlockTags = (event) => { From 09336e5e6c1f042a1b99cfa8624858cb3f9ce6b0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:33:13 +0100 Subject: [PATCH 19/52] cl again --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89aec2d1a..c3243a510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - Fixed food processor outputs not stacking @gustovafing - Fixed using the grappling hook on a ladder killing you (#106) @Zippity - Added more missing food processor recipes (#1632, #1638) @Pyritie +- Fixed a few stuck quests (#1667, #1666) @Wicpar ## [0.10.9] - 10-08-2025 ### Changes From 5f5c39ea29e6a154bc08843a2e361e707a411f5b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:35:27 +0100 Subject: [PATCH 20/52] added armor stand shift swap #1645 --- pakku-lock.json | 165 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 118 insertions(+), 47 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 5a2807488..8af7380b2 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1184,6 +1184,76 @@ } ] }, + { + "pakku_id": "RrbGnesL6XuNDCb1", + "pakku_links": [ + "x1EwQZ6H2kVKR3U3" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "armor-stand-shift-swap", + "modrinth": "armor-stand-shift-swap" + }, + "name": { + "curseforge": "Armor Stand Shift Swap", + "modrinth": "Armor Stand Shift Swap" + }, + "id": { + "curseforge": "905132", + "modrinth": "vFDTNKLA" + }, + "files": [ + { + "type": "curseforge", + "file_name": "armorstandshiftswap-forge-1.20.1-1.0.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5877/380/armorstandshiftswap-forge-1.20.1-1.0.0.jar", + "id": "5877380", + "parent_id": "905132", + "hashes": { + "sha1": "4dc1875a4f6ca118f17a86531d314e095f7c2f1f", + "md5": "30648633cdc4a0fc652d951c5299bf6d" + }, + "required_dependencies": [ + "419699" + ], + "size": 83802, + "date_published": "2024-11-05T15:01:52.897Z" + }, + { + "type": "modrinth", + "file_name": "armorstandshiftswap-forge-1.20.1-1.0.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/vFDTNKLA/versions/o416kPwV/armorstandshiftswap-forge-1.20.1-1.0.0.jar", + "id": "o416kPwV", + "parent_id": "vFDTNKLA", + "hashes": { + "sha512": "9be8e668569ce2b070fcb36d4dea4c34a2a50fbff2dadcd38cf2a9b75b3f598d9ad156380a9d74d87c67736dde3a04382271174a5ff57ed02c6da1785f3298d1", + "sha1": "4dc1875a4f6ca118f17a86531d314e095f7c2f1f" + }, + "required_dependencies": [ + "lhGA9TYQ" + ], + "size": 83802, + "date_published": "2024-11-05T15:34:55.705362Z" + } + ] + }, { "pakku_id": "Wg44U8f1K4nbIsj1", "pakku_links": [ @@ -1385,7 +1455,7 @@ ] }, { - "pakku_id": "i6VxVERP0ZuJlfnt", + "pakku_id": "tcGlxrXYONei6sfG", "type": "MOD", "side": "SERVER", "slug": { @@ -1401,6 +1471,27 @@ "modrinth": "OfKzpbRU" }, "files": [ + { + "type": "curseforge", + "file_name": "baguettelib-1.20.1-Forge-1.1.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6909/482/baguettelib-1.20.1-Forge-1.1.0.jar", + "id": "6909482", + "parent_id": "1264423", + "hashes": { + "sha1": "140ea51f71e5f316e473354cdeeb0dbba5422632", + "md5": "74448bf96f648170cc03ab7bee6a6e3d" + }, + "required_dependencies": [], + "size": 30314, + "date_published": "2025-08-20T23:30:04.997Z" + }, { "type": "modrinth", "file_name": "baguettelib-1.20.1-Forge-1.0.0.jar", @@ -1422,27 +1513,6 @@ "required_dependencies": [], "size": 26550, "date_published": "2025-06-25T13:03:42.486510Z" - }, - { - "type": "curseforge", - "file_name": "baguettelib-1.20.1-Forge-1.1.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6909/482/baguettelib-1.20.1-Forge-1.1.0.jar", - "id": "6909482", - "parent_id": "1264423", - "hashes": { - "sha1": "140ea51f71e5f316e473354cdeeb0dbba5422632", - "md5": "74448bf96f648170cc03ab7bee6a6e3d" - }, - "required_dependencies": [], - "size": 30314, - "date_published": "2025-08-20T23:30:04.997Z" } ] }, @@ -3133,7 +3203,8 @@ { "pakku_id": "tIc0aOMFiuJNztfY", "pakku_links": [ - "0DMPJ1AWW6qfYubI" + "0DMPJ1AWW6qfYubI", + "tcGlxrXYONei6sfG" ], "type": "MOD", "side": "SERVER", @@ -12722,7 +12793,7 @@ ] }, { - "pakku_id": "ZGt3prWXJVURPwKE", + "pakku_id": "kR8s4t9LptntMSpg", "pakku_links": [ "64uacGcEw697jVGs" ], @@ -12741,29 +12812,6 @@ "modrinth": "ONgsGaM9" }, "files": [ - { - "type": "modrinth", - "file_name": "waterflasks-3.0.8.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/VIl9hEx7/waterflasks-3.0.8.jar", - "id": "VIl9hEx7", - "parent_id": "ONgsGaM9", - "hashes": { - "sha512": "7cc5e39ac45223a4b28387a60e0b361d777f44f34b9baa5d24a1541a0a21c0decf86146c19dbe4fcc4892048c0ca4f5a5737d09210c42f61d0e34448b3390c47", - "sha1": "6fc568609f6a182d18f8f4fac286c9bf122a486b" - }, - "required_dependencies": [ - "JaCEZUhg" - ], - "size": 939203, - "date_published": "2025-07-29T01:27:09.745095Z" - }, { "type": "curseforge", "file_name": "waterflasks-3.0.9.jar", @@ -12787,6 +12835,29 @@ ], "size": 943232, "date_published": "2025-08-12T03:42:03.923Z" + }, + { + "type": "modrinth", + "file_name": "waterflasks-3.0.8.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/VIl9hEx7/waterflasks-3.0.8.jar", + "id": "VIl9hEx7", + "parent_id": "ONgsGaM9", + "hashes": { + "sha512": "7cc5e39ac45223a4b28387a60e0b361d777f44f34b9baa5d24a1541a0a21c0decf86146c19dbe4fcc4892048c0ca4f5a5737d09210c42f61d0e34448b3390c47", + "sha1": "6fc568609f6a182d18f8f4fac286c9bf122a486b" + }, + "required_dependencies": [ + "JaCEZUhg" + ], + "size": 939203, + "date_published": "2025-07-29T01:27:09.745095Z" } ] }, From 33e99aedccf00de50d9e22ad5e7e7cb3f7ae2ffa Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 01:21:58 +0100 Subject: [PATCH 21/52] cl tidying --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3243a510..227b659c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ # Changelog ## [Unreleased] -### Changes +### Major changes - Complete rework of prospector's picks. (#1594) @Redeix +- Removed the mod that was causing placed entities to sometimes not spawn +- Removed energy P2P (#1661) @TomPlop @BlueBoat29 +### Changes - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie - Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie @@ -14,7 +17,6 @@ - Refactored locometal recipes to use stonecutters, metal plated locometal is now also much cheaper (#1624) @Pyritie - Increased the air capacity of space suits by 250% @Pyritie - Converted custom tooltips to lang strings for translations (#1663) @Redeix -- Removed energy P2P (#1661) @TomPlop @BlueBoat29 - Fixed grammar on death messages and added some new ones (#1642) @vdegans - Added IV fridge, and IV-UV aqueous accumulator, food processor, food oven, and gas compressor machines @Pyritie - Added machine recipes for the wrought iron grill @Pyritie From ba1889bf8d854f5ada0588f975c6d88e13f98da6 Mon Sep 17 00:00:00 2001 From: Zippity Date: Fri, 22 Aug 2025 03:35:50 -0700 Subject: [PATCH 22/52] fix semiheavy concurrent with tfg core (#1671) --- .../configured_feature/mars/semiheavy_ammoniacal_water.json | 2 +- kubejs/data/tfg/worldgen/noise_settings/mars_noise.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/semiheavy_ammoniacal_water.json b/kubejs/data/tfg/worldgen/configured_feature/mars/semiheavy_ammoniacal_water.json index c601fed97..832a00279 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/semiheavy_ammoniacal_water.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/semiheavy_ammoniacal_water.json @@ -1,7 +1,7 @@ { "type": "tfc:flood_fill_lake", "config": { - "state": "tfg:semiheavy_ammoniacal_water", + "state": "tfg:fluid/semiheavy_ammoniacal_water", "replace_fluids": [], "overfill": true } diff --git a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json index 9b093369b..fa4e04717 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json @@ -8,7 +8,7 @@ "Name": "ad_astra:mars_stone" }, "default_fluid": { - "Name": "tfg:semiheavy_ammoniacal_water" + "Name": "tfg:fluid/semiheavy_ammoniacal_water" }, "noise": { "min_y": -32, From 98e873cba53b3f3108143b92e2083fda5e6fab98 Mon Sep 17 00:00:00 2001 From: Gustavo Date: Fri, 22 Aug 2025 20:54:59 +1000 Subject: [PATCH 23/52] add Alabaster rock crushing --- kubejs/server_scripts/tfg/recipes.rocks.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index c831d572a..6118e4eb9 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -794,4 +794,20 @@ function registerTFGRockRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) }) //#endregion + + //#region Alabaster + + event.recipes.gtceu.rock_breaker("tfg:alabaster") + .notConsumable("tfc:alabaster/raw") + .itemOutputs("tfc:alabaster/raw") + .duration(16) + .EUt(7) + + event.recipes.gtceu.cutter("tfg:raw_alabaster_to_bricks") + .inputItems("tfc:alabaster/raw") + .outputItems("tfc:alabaster_brick", 4) + .duration(40) + .EUt(2) + + //#endregion } \ No newline at end of file From 6eb2de022096068e4edf8f8f7b823bfcc595afc5 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Fri, 22 Aug 2025 07:41:27 -0400 Subject: [PATCH 24/52] Mars ressources (#1569) * stupid git again * First entry for the mars ore line * Adding the Ostrum Harvester in its first version * Adding new casings * Adding the complete Mars Ore Line * Bugs again * Add ores and textures * More changes * Changes to heavy and semi water and more fluid veins * Adding more crafting recipes * More recipes * weird * nerf ores * fix thorium * Adding dusty ores * More circuits change to gate IV at the end of Mars * Fix multiblocks * Changes to AE2 * Unified Pattern Provider and Interface * Removing Bedrock * Fully remove Bedrock Miner * Disable many stuffs until Mars * More fixes until Mars is out * Requested changes * Cleaning kubejs files * Adding Moon Ore Line * Change Mars water to Centrifuge * Fix duplicate --- .../material_sets/bright/dusty_raw_ore.json | 8 + .../material_sets/certus/dusty_raw_ore.json | 8 + .../material_sets/diamond/dusty_raw_ore.json | 8 + .../material_sets/dull/dusty_raw_ore.json | 8 + .../material_sets/fine/dusty_raw_ore.json | 8 + .../material_sets/metallic/dusty_raw_ore.json | 8 + .../material_sets/quartz/dusty_raw_ore.json | 8 + .../material_sets/ruby/dusty_raw_ore.json | 8 + .../material_sets/shiny/dusty_raw_ore.json | 8 + .../material_sets/tfc_gold/dusty_raw_ore.json | 8 + .../tfc_realgar/dusty_raw_ore.json | 8 + .../block/fluids/fluid.dense_ostrum_vapor.png | Bin 0 -> 27412 bytes .../fluid.dense_ostrum_vapor.png.mcmeta | 87 +++++++ .../fluids/fluid.lightweight_ostrum_vapor.png | Bin 0 -> 25572 bytes .../fluid.lightweight_ostrum_vapor.png.mcmeta | 87 +++++++ .../block/fluids/fluid.ostrum_vapor.png | Bin 0 -> 26828 bytes .../fluids/fluid.ostrum_vapor.png.mcmeta | 87 +++++++ .../block/fluids/fluid.regolith_vapor.png | Bin 0 -> 15957 bytes .../fluids/fluid.regolith_vapor.png.mcmeta | 5 + .../fluid.residual_radioactive_concoction.png | Bin 0 -> 14452 bytes ...residual_radioactive_concoction.png.mcmeta | 67 +++++ .../item/material_sets/dull/dusty_raw_ore.png | Bin 0 -> 5934 bytes .../dull/dusty_raw_ore_overlay.png | Bin 0 -> 3119 bytes .../dull/dusty_raw_ore_overlay.png.mcmeta | 67 +++++ .../dull/dusty_raw_ore_secondary.png | Bin 0 -> 358 bytes .../machine_casing_vacuum_engine_intake.png | Bin 0 -> 548 bytes ...ine_casing_vacuum_engine_intake.png.mcmeta | 5 + ...ine_casing_vacuum_engine_intake_active.png | Bin 0 -> 1083 bytes ...ing_vacuum_engine_intake_active.png.mcmeta | 5 + .../assets/tfg/textures/block/sand_spice.png | Bin 0 -> 1763 bytes kubejs/server_scripts/ae2/recipes.js | 136 +++++----- kubejs/server_scripts/extended_ae2/recipes.js | 246 ++++++++++++------ kubejs/server_scripts/gregtech/data.js | 152 ++++++++++- kubejs/server_scripts/gregtech/recipes.js | 30 ++- .../gregtech/recipes.machines.js | 244 +++++++++++------ kubejs/server_scripts/tfg/recipes.js | 2 + kubejs/server_scripts/tfg/recipes.mars.js | 72 +++++ .../tfg/recipes.miscellaneous.js | 2 +- .../server_scripts/tfg/recipes.moon_ores.js | 131 ++++++++++ kubejs/server_scripts/tfg/recipes.nuclear.js | 43 ++- kubejs/server_scripts/tfg/recipes.space.js | 2 +- .../server_scripts/tfg/recipes.terrariums.js | 9 +- kubejs/startup_scripts/ad_astra/materials.js | 1 - kubejs/startup_scripts/gtceu/constants.js | 7 +- kubejs/startup_scripts/gtceu/machines.js | 132 +++++++++- kubejs/startup_scripts/gtceu/materials.js | 13 + kubejs/startup_scripts/gtceu/recipe_types.js | 24 ++ kubejs/startup_scripts/tfg/blocks.js | 25 ++ kubejs/startup_scripts/tfg/fluids.js | 8 + kubejs/startup_scripts/tfg/items.js | 4 +- kubejs/startup_scripts/tfg/items.nuclear.js | 6 - kubejs/startup_scripts/tfg/materials.js | 66 +++++ .../startup_scripts/tfg/materials.nuclear.js | 8 - 53 files changed, 1610 insertions(+), 251 deletions(-) create mode 100644 kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_secondary.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/sand_spice.png create mode 100644 kubejs/server_scripts/tfg/recipes.mars.js create mode 100644 kubejs/server_scripts/tfg/recipes.moon_ores.js delete mode 100644 kubejs/startup_scripts/tfg/items.nuclear.js diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png new file mode 100644 index 0000000000000000000000000000000000000000..d73ae13b2508828e7ea26d98266c19d1a6afb419 GIT binary patch literal 27412 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

syP2! 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 G5}E-2P1oK4 literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta new file mode 100644 index 000000000..744a3d54c --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta @@ -0,0 +1,87 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 39, + 38, + 37, + 36, + 35, + 34, + 33, + 32, + 31, + 30, + 29, + 28, + 27, + 26, + 25, + 24, + 23, + 22, + 21, + 20, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png new file mode 100644 index 0000000000000000000000000000000000000000..79398a2326e36cfa65bfec494d652db6fc5ac9df GIT binary patch literal 25572 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 ROTm*t3{O`-mvv4FO#lmQuu1>` literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta new file mode 100644 index 000000000..744a3d54c --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta @@ -0,0 +1,87 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 39, + 38, + 37, + 36, + 35, + 34, + 33, + 32, + 31, + 30, + 29, + 28, + 27, + 26, + 25, + 24, + 23, + 22, + 21, + 20, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png new file mode 100644 index 0000000000000000000000000000000000000000..c2602b5a607583b8845801b16ba0e9f7c613df8f GIT binary patch literal 26828 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 L>gTe~DWM4fP4u7T literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta new file mode 100644 index 000000000..744a3d54c --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta @@ -0,0 +1,87 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 39, + 38, + 37, + 36, + 35, + 34, + 33, + 32, + 31, + 30, + 29, + 28, + 27, + 26, + 25, + 24, + 23, + 22, + 21, + 20, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png new file mode 100644 index 0000000000000000000000000000000000000000..915dedcc40ff08763d9317f69f1100f73d31dd05 GIT binary patch literal 15957 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 literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png new file mode 100644 index 0000000000000000000000000000000000000000..c72ea40ed6825c7e9ab252bf999d53f0f80a9992 GIT binary patch literal 14452 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 literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta new file mode 100644 index 000000000..6439dab8e --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta @@ -0,0 +1,67 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 29, + 28, + 27, + 26, + 25, + 24, + 23, + 22, + 21, + 20, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..19fa4c874ea918554159c7047577082e440e5cbd GIT binary patch literal 5934 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 z%0Aj&{PFDxzq|4i$3mUk-Pv#N-uSaJY{GVhIdd&_FIFu5+2!%*K9^vvcHN!IB~MpI zy_God!x`Rx(`wVR3^_A+|)@}&eX zX1*EzZc16C&XdWhYr_rFcRtS+df^Ph*Isq(P-jwLV7R6^!gL%T8T$i@l~wZ{EGXF*bW=&$<7j$T#H`SAU60AvgQq zyo0A1Cd|LHjOj<^h4s^y8yshRaFk`&ucIuxX8pd%`pfQ~*-dtzuj}d=4_s>2<+@y5 z^Q}>mf0|rQV9Anulao8yT~kH1X2vYrc!JsJpX?*YM4hcmzb-D9W5{{lIJ36k-J_>r z)o++D{;zBh7O$H#r}D`grACc4ad&SVVVdDvVeqv7sBwdx+?;(&*c%=<2!CrlYx82= z#jR7yOZwP!ZnM98-st@$Na?b{mD+;EYxbpnda1Jbf)>9{sM@BP>`!il)gR3JeV~V( z)$j_t-^YZvg@2oC-XBPl6FC+XJ?E2n$`p-@x*#Jfk~X<~ef6D9^udh%1_%6f*8hqu z*mpExBKy-&`)W>kw;44y1zT$mOg;Rq(fb*{&1vRKQH7I2^hFNXSMWW~=jUfLVPKGd zW&Jxn^UWsyH!~ZGeUDC5mgldrDcHY1L7blo-oM`AM&qA-khJa(#Gk@U4J1lSa;-o6a~?EjV{JbI^8Q_?jx*o;!~C*wu6*46-Df!#*f%cRzI?m*4#N{{Tlt%sm)51^ zl$`r{TIuZ?`#b(xd|C1t>C5y_{rYstV*3sDUH$iCoa!S#o@`)y^R&_9O89xj-wxvP zB8u~Bf2$r~l=~uMwVZe6bOqVOZ;k#9^S91^b;sxF{2Si8-^-~-&NKMFeG@aUy2-NC zHP6(=@@m2t|9)DvUEjV?@OZ?EzYTtljg6u`eGM< z08{b0-m_f(O=Bl4$DX>ju8mD{eFss4=KxmQPbMpchdSwH&$ zo(=p#%kFA2vTf(DyIG#4^MLnTViw;i)UxF_tnU<&k6x6`e&`3##W}|WC&m>Se>$Kp&;Nj_eqp^(TB*$6 zo80cD`_-S%p4`0t`?pQD3`HFL$IRcwUc9+Od~4mrQzy#{pXL8}ChR>awe9T5gV%rF z>-YWK`8MXJOcMP_WVOl>oooUf(&NR}1`~zDi@if;@lQ;ygFG z7V|fiM-t_HEW*C3Y%VxyeP`ayr}{d!e}ZSY{$B87-HEvk!XMqze!cLFk@NWe{>S+j zZMNPreflT-%U^mCihH{#lKRom|YG(L1E_~wY$GyUO8`O_99@@ak zy^PKJiT;->FQTfeB6BX5pVWQVzs0~P)72l{g5_46(t395kBOaJ&Mdim8BuvGKe*$LFfaeaAEx;t|G0L3 z@Q!5rDQU_2-EV)b+sOBm`#al@dfq!XLb}5xg`3_z-o4MN@86ju)o7^?eud0a^(M!D zb47={SR{jd@ z+3Vs1o~LQ;JZW3DKAyqNj(<*{{sh~=Ik)U5s%)6>SC~^giS6|LzZIi?+=F8b-H`%jKYgKG#+!QtQ#JZo%FaOPzFD)zms{UEIuhZPFqWeewyZSEe)L)ai z{M0S@lI42x@9a*BoI9;(27B_eJJ*9*a!1_!e_&Sag1IyIo%sET+cNNq8sp7f4L%wcd++Z$uK3A5yW~{fqWboJ1_lNO MPgg&ebxsLQ08tqKF8}}l literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta new file mode 100644 index 000000000..6439dab8e --- /dev/null +++ b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta @@ -0,0 +1,67 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 29, + 28, + 27, + 26, + 25, + 24, + 23, + 22, + 21, + 20, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..592b1febe7e26b80a063ed251e06689cc776ca83 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=7pk#^jRT)bx6aK1^u|M~g3KX!ac_ZR7$ zUcEzX|E_g6>sULQ6$~C*%==gxJ3Sz0;+7=ygUc3Y-u|Yfr|cX2q=d=*>_kb%qz;?& zyS+UWlh~f-r%bcxlYgN8XO6_a_rFi?TKC-My!P?um2DsV3cF=mONI0pEEpTVFKO;9 zDNcHN*+g|iLv*9Ixo@zjYa#dH3CCMFgk1t#M87bt-MULn{KprYEz{0!^5I|1*~OLm zLi<6dfs$3z<$G7BeXm_F&dGE5z^%K+yJoW%Jeb=3JKo?K=gRvP7J3(oelajGFnGH9 KxvXy@og*{Uyy)E+=ckt@GHfxcFg$!Rxq+9IuwQlD>&+t)Wu$k|_)V}M1VYw}Uw!Q=;_9>fa+q)A zG!Dfd8`V-H-6pB5xt_i1`ss}UUK5{N{{DN<@YJR=jitGXvDf{k2XQt0tl@JIU}50f zu`c_N!JmIlr(d3L|6BKd)|4O*&De9NcHe#f?wy3mVY7(s|I<=z8GdB$y5|z+CCI`U z8d_*IcS6vnsI@cBrL8@_>sz$V`Niw9f9;)j`B#k{{bkC*L!TDE&<)cx=K$3Z=EiXL#!`zbCVfc(&;P}SH z+#7Dc{bzmZ^iv^CRff3-6FzuOVp(gNIm^l{QDPgztjg0LK2}_i>_0BQd)3*gxo*X4 zXRm($+peDB^-Z>4K2FCzFfcIirABzB`T8mdKI;Vst0OsuX Ad;kCd literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta new file mode 100644 index 000000000..f96626000 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png new file mode 100644 index 0000000000000000000000000000000000000000..8072b8fb4fe52a0ad53fd40c918ffbc745127478 GIT binary patch literal 1083 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznU~u4IV_;wquKhlZfr0sjr;B4qMC;q>`uU&Y zM2_1lw=7xJ)VXLIPrKq*X2Uo}&b(#o8(z-r+{c_|7I}H5siN@YwVKneoE1IDBI+7q zy7HmmlRJ0c$vgh}^yf%1Pwvlqmy7p(pYz_<_T~5AyEo}vJZr$iaB5S?b=SazS<7~@ z8Td|4i=4J+-@Zq`?Y8A!e*HD;+`W7EvcAtg+jcRd<^Au9dG5jozSlmoNZT9t`O~LE zNgEfeT6ODC*y^KCpQ(K#S*KzQsTdgJKy~MJ9l#3 z{{54~u11HM?_K-#nmJE$eCOJ*?oB#Z*Y68xIMkRZ5fZvo>-+oHj>6xnHpH!u)SJH5 zYw|m3p7tY!J|eDNi(i(UI(zo)`>F}~+n?NCdx=%{^IAEJzQZ|YtGAX2u&8(*su`2+hU2{FEr}iPfA3g#I>BPi-Zd*+niJkuaH;E{#h8uoRs>rVdNa`)J0 zn@c9PYuGR4D(Sq;DxD)|V{7|2>eT-)5At6)?uuIZ^T7f+5AWAi3A5BT-|WfTUR`0= z@py)cXF+VZ>!V$Io|9JmmjBA2aK3oz{MWm_RM{RfQ0Yr9{qU;l!iAaB<{b50fBo?H z+IjQmUrjpLVfy2soV@(icPAW{-d=@o^Gve{~kWA;%^}T+beeCf@FU9+LGtZ`3^c6esZ+YnSjLC9t>uUMu%zv{}jb;k4Fh))j zY*UP!W;p-+exAqo&#}+HzruXljqUfjn;#0?-uAIp{`969=by7UI!Ls=>iEBged|w$ zZ(;V=9wz%) literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png.mcmeta new file mode 100644 index 000000000..f96626000 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} diff --git a/kubejs/assets/tfg/textures/block/sand_spice.png b/kubejs/assets/tfg/textures/block/sand_spice.png new file mode 100644 index 0000000000000000000000000000000000000000..2989871e6a5aa867adafd937fcc557a0d2aa97d2 GIT binary patch literal 1763 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7$&4fc&7RK zGH5X{FmN!iF|si*GcYhPGB7bPFbYB0j0_BnQVbxI85tND!WgCD>^MdZs2U~)hW1Pb z7O-9hhBO8U@PP6mH1h&RsA@(Ah6PM;)dCBc5p0mge*T4585kHi3p^r=85p>QL70(Y z)*J~224=U+kcg59UmvUF{9L`nl>DSry^7odkS+$B3ag6Tg51=SM1_jnoV;SI3R@+x z3ah+gE0D0hk^)#sNw%$0gl~X?bAC~(f|;Iyo`I4bmx6+VO;JjkRgjAtRC`fMnypes zNlAf~zJ7Umxn8-kUVc%!zM-Y1rM`iYzLAk`QA(O_ab;dfVufyAu`tKo%*$0K}aonP~`{@`|C}O3u&K2g&Fg>KW)`)0SG1i9;Jm z2BHn@FNke6Aj7Pj^K%P|Qj3c-^YiQsZNL_wh#{N@Q6H3AoS#z)@R>yq!5r53(S-hDdB0kOk2-1Z3ow*}0abZ%>*8Z{1RmLi0J8x3YhI2_$Y&wZfJNF;8IX~<5ZSLZCiMI}OUrRlB=E=Js zeWkGzmuR+~o?cf|TkZHodDU}k!OI0JuWF(C!d4L)*zUka;js0z&AQ2mc{_ERaDeSL4{C90MMzMl|$%jTQL zHfu2s6_Z=FvEnm2qiXaIvTeJ?FlF-8rDa;%sxN&lVK2xr>QzYybQHg|XI0|mMIl>G z|CWChe??=q=#1w7)7&&4O*~uNvahvp$rAszbaAU}JYX%nGoti!i$j#*a)`$2ZS vnKt*-c^iXYSl{*fxH7LoyR}VC`qWQ$w%eJ$4}Z)m1C`gFu6{1-oD!M { 'ae2:logic_processor', 'ae2:engineering_processor', 'ae2:calculation_processor', - '#gtceu:circuits/iv', + '#gtceu:circuits/ev', '6x #forge:plates/stainless_steel') .inputFluids(Fluid.of('tfg:fluix', 144*5)) .itemOutputs('ae2:crafting_unit') @@ -1167,7 +1167,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { 'ae2:logic_processor', 'ae2:engineering_processor', 'ae2:calculation_processor', - '#gtceu:circuits/iv', + '#gtceu:circuits/ev', '6x #forge:plates/stainless_steel') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*5)) .itemOutputs('2x ae2:crafting_unit') @@ -1255,57 +1255,57 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { event.recipes.gtceu.assembler('ae2:interface_mv') .itemInputs( 'gtceu:mv_conveyor_module', - '8x #forge:plates/glass', + '2x #tfc:workbenches', '4x #forge:plates/aluminium', '4x ae2:annihilation_core', '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:interface') - .duration(200) + .duration(20*20) .EUt(GTValues.VA[GTValues.MV]) .cleanroom(CleanroomType.CLEANROOM) - // HV Moon Only - event.recipes.gtceu.assembler('ae2:interface_hv_moon') + // MV Moon Only + event.recipes.gtceu.assembler('ae2:interface_mv_moon') .itemInputs( - 'gtceu:hv_conveyor_module', - '8x #forge:plates/glass', - '4x #forge:plates/stainless_steel', + 'gtceu:mv_conveyor_module', + '2x #tfc:workbenches', + '4x #forge:plates/aluminium', '4x ae2:annihilation_core', '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('4x ae2:interface') - .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + .duration(20*10) + .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') - // EV - event.recipes.gtceu.assembler('ae2:interface_ev') + // IV + event.recipes.gtceu.assembler('ae2:interface_iv') .itemInputs( - 'gtceu:ev_conveyor_module', - '8x #forge:plates/glass', - '4x #forge:plates/titanium', + 'gtceu:iv_conveyor_module', + '2x #tfc:workbenches', + '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 1152)) - .itemOutputs('8x ae2:interface') - .duration(200) - .EUt(GTValues.VA[GTValues.EV]) + .inputFluids(Fluid.of('tfg:fluix', 144*8)) + .itemOutputs('16x ae2:interface') + .duration(20*20) + .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) - // LuV - event.recipes.gtceu.assembler('ae2:interface_luv') + // IV Moon Only + event.recipes.gtceu.assembler('ae2:interface_iv_moon') .itemInputs( - 'gtceu:luv_conveyor_module', - '8x #forge:plates/glass', - '4x #forge:plates/rhodium_plated_palladium', - '32x ae2:annihilation_core', - '32x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 4608)) + 'gtceu:iv_conveyor_module', + '2x #tfc:workbenches', + '4x #forge:plates/tungsten_steel', + '16x ae2:annihilation_core', + '16x ae2:formation_core') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('32x ae2:interface') - .duration(200) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) + .duration(20*10) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') //#endregion @@ -1322,51 +1322,51 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:pattern_provider') - .duration(800) + .duration(20*20) .EUt(GTValues.VA[GTValues.MV]) .cleanroom(CleanroomType.CLEANROOM) - // HV Moon Only + // MV Moon Only event.recipes.gtceu.assembler('ae2:pattern_provider_hv_moon') .itemInputs( - 'gtceu:hv_robot_arm', + 'gtceu:mv_robot_arm', '2x #tfc:workbenches', - '4x #forge:plates/stainless_steel', + '4x #forge:plates/aluminium', '4x ae2:annihilation_core', '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('4x ae2:pattern_provider') - .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + .duration(20*10) + .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') - // EV + // IV event.recipes.gtceu.assembler('ae2:pattern_provider_ev') .itemInputs( - 'gtceu:ev_robot_arm', + 'gtceu:iv_robot_arm', '2x #tfc:workbenches', - '4x #forge:plates/titanium', + '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 1152)) - .itemOutputs('8x ae2:pattern_provider') - .duration(800) - .EUt(GTValues.VA[GTValues.EV]) + .inputFluids(Fluid.of('tfg:fluix', 144*8)) + .itemOutputs('16x ae2:pattern_provider') + .duration(20*20) + .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) - // LuV + // IV Moon Only event.recipes.gtceu.assembler('ae2:pattern_provider_luv') .itemInputs( - 'gtceu:luv_robot_arm', + 'gtceu:iv_robot_arm', '2x #tfc:workbenches', - '4x #forge:plates/rhodium_plated_palladium', - '32x ae2:annihilation_core', - '32x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 4608)) + '4x #forge:plates/tungsten_steel', + '16x ae2:annihilation_core', + '16x ae2:formation_core') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('32x ae2:pattern_provider') - .duration(800) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) + .duration(20*10) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') //#endregion @@ -2152,24 +2152,38 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '8x ae2:engineering_processor', '14x gtceu:iv_sensor', 'ae2:logic_processor') - .inputFluids(Fluid.of('gtceu:titanium', 1440)) + .inputFluids(Fluid.of('tfg:fluix', 144*200)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*150)) .itemOutputs('ae2:quantum_ring') .duration(900) - .EUt(8300) + .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) // Quantum Link Chamber event.recipes.gtceu.assembly_line('ae2:quantum_link') .itemInputs( '8x ae2:fluix_pearl', - '6x ae2:quartz_vibrant_glass', - '8x ae2:engineering_processor', - '14x gtceu:iv_sensor', - '2x gtceu:hv_lithium_battery') - .inputFluids(Fluid.of('gtceu:titanium', 1088)) + 'gtceu:fusion_glass', + '32x megacells:accumulation_processor', + '32x megacells:accumulation_processor', + '32x ae2:engineering_processor', + '32x ae2:engineering_processor', + '32x ae2:logic_processor', + '32x ae2:logic_processor', + '32x ae2:calculation_processor', + '32x ae2:calculation_processor', + 'gtceu:ruthenium_trinium_americium_neutronate_hex_wire', + '32x gtceu:uv_sensor', + '32x gtceu:uv_emitter', + '8x gtceu:uv_field_generator', + 'gtceu:max_battery') + .inputFluids(Fluid.of('tfg:fluix', 144*2000)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*1500)) + .stationResearch(b => b.researchStack(Item.of('minecraft:glass')).EUt(GTValues.VA[GTValues.UV]).CWUt(256)) + .dimension('ad_astra:moon') .itemOutputs('ae2:quantum_link') .duration(700) - .EUt(8300) + .EUt(GTValues.VA[GTValues.UHV]) .cleanroom(CleanroomType.CLEANROOM) // Chemical Reactor diff --git a/kubejs/server_scripts/extended_ae2/recipes.js b/kubejs/server_scripts/extended_ae2/recipes.js index 2b7119994..6c6842bac 100644 --- a/kubejs/server_scripts/extended_ae2/recipes.js +++ b/kubejs/server_scripts/extended_ae2/recipes.js @@ -14,58 +14,79 @@ const registerExtendedAE2Recipes = (event) => { //#region Ext Interface - // IV + // IV - event.recipes.gtceu.assembler('expatternprovider:ex_interface_iv') + event.recipes.gtceu.assembler('tfg:ex_interface_iv') .itemInputs( 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:interface') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:ex_interface') .duration(300) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:ex_interface_luv_moon') + event.recipes.gtceu.assembler('tfg:ex_interface_iv_moon') .itemInputs( - 'gtceu:luv_conveyor_module', + 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:interface') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:ex_interface') .duration(300) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(1) // ZPM - event.recipes.gtceu.assembler('expatternprovider:ex_interface_zpm') + event.recipes.gtceu.assembler('tfg:ex_interface_zpm') .itemInputs( 'gtceu:zpm_conveyor_module', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '16x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:ex_interface') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:ex_interface') .duration(300) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // Extended Interface Upgrade + // ZPM Moon Only + + event.recipes.gtceu.assembler('tfg:ex_interface_zpm_moon') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:interface') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:ex_interface') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(1) + + // Interface Upgrade // IV @@ -73,34 +94,34 @@ const registerExtendedAE2Recipes = (event) => { .itemInputs( 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', - '#ae2:interface') + '2x megacells:accumulation_processor', + '1x #ae2:interface') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:interface_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_luv_moon') + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_iv_moon') .itemInputs( - 'gtceu:luv_conveyor_module', + 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor') + '2x megacells:accumulation_processor') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:interface_upgrade') .duration(300) - .circuit(4) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(2) // ZPM @@ -109,16 +130,33 @@ const registerExtendedAE2Recipes = (event) => { 'gtceu:zpm_conveyor_module', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '8x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:interface_upgrade') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:interface_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) + + // ZPM Moon Only + + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_zpm_moon') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:interface_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(2) //#endregion @@ -126,106 +164,143 @@ const registerExtendedAE2Recipes = (event) => { // IV - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_luv') + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv') .itemInputs( '4x #expatternprovider:extended_interface', '4x megacells:accumulation_processor', 'gtceu:iv_robot_arm', 'gtceu:iv_fluid_regulator', '4x #forge:dense_plates/tungsten_steel', - '#gtceu:circuits/iv') + '#gtceu:circuits/luv') .inputFluids(Fluid.of('tfg:fluix', 144*9)) .itemOutputs("expatternprovider:oversize_interface") .duration(300) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) - // LuV + // IV Moon - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm') + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv_moon') .itemInputs( '4x #expatternprovider:extended_interface', '4x megacells:accumulation_processor', - 'gtceu:luv_robot_arm', - 'gtceu:luv_fluid_regulator', - '4x #forge:dense_plates/rhodium_plated_palladium', + 'gtceu:iv_robot_arm', + 'gtceu:iv_fluid_regulator', + '4x #forge:dense_plates/tungsten_steel', '#gtceu:circuits/luv') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*4)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*9)) .itemOutputs("4x expatternprovider:oversize_interface") .duration(300) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') // ZPM - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_uv') + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm') .itemInputs( '8x #expatternprovider:extended_interface', '4x megacells:accumulation_processor', 'gtceu:zpm_robot_arm', 'gtceu:zpm_fluid_regulator', '4x #forge:dense_plates/naquadah_alloy', - '#gtceu:circuits/zpm') + '#gtceu:circuits/uv') .inputFluids(Fluid.of('tfg:fluix', 144*18)) .itemOutputs("8x expatternprovider:oversize_interface") .duration(300) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + // ZPM Moon + + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm_moon') + .itemInputs( + '8x #expatternprovider:extended_interface', + '4x megacells:accumulation_processor', + 'gtceu:zpm_robot_arm', + 'gtceu:zpm_fluid_regulator', + '4x #forge:dense_plates/naquadah_alloy', + '#gtceu:circuits/uv') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*18)) + .itemOutputs("16x expatternprovider:oversize_interface") + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + //#endregion //#region Ext Pattern Provider // IV - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_iv') + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv') .itemInputs( 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:pattern_provider') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:ex_pattern_provider') .duration(300) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_moon') + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv_moon') .itemInputs( - 'gtceu:luv_robot_arm', + 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:pattern_provider') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:ex_pattern_provider') .duration(300) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(1) // ZPM - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_zpm') + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm') .itemInputs( 'gtceu:zpm_robot_arm', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '16x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:ex_pattern_provider') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:ex_pattern_provider') .duration(300) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) + + // ZPM Moon Only + + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm_moon') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:pattern_provider') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:ex_pattern_provider') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(1) // Pattern Provider Upgrade @@ -235,34 +310,34 @@ const registerExtendedAE2Recipes = (event) => { .itemInputs( 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', - '#ae2:pattern_provider') + '2x megacells:accumulation_processor', + '1x #ae2:pattern_provider') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:pattern_provider_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_luv_moon') + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_iv_moon') .itemInputs( - 'gtceu:luv_robot_arm', + 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor') + '2x megacells:accumulation_processor') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:pattern_provider_upgrade') .duration(300) - .circuit(4) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(2) // ZPM @@ -271,16 +346,33 @@ const registerExtendedAE2Recipes = (event) => { 'gtceu:zpm_robot_arm', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '8x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:pattern_provider_upgrade') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:pattern_provider_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) + + // ZPM Moon Only + + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_zpm_moon') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:pattern_provider_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(2) //#endregion diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index 115b7fada..db04fc032 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -124,7 +124,7 @@ const registerGTCEUMetals = (event) => { const registerGTCEUBedrockOreVeins = (event) => { - +/* // Tin, Magnesium event.add('tfg:moon_tin', vein => { vein.weight(75) @@ -155,7 +155,6 @@ const registerGTCEUBedrockOreVeins = (event) => { .material(GTMaterials.Chalcopyrite, 10) .material(GTMaterials.Zeolite, 4) .material(GTMaterials.Cassiterite, 3) - .material(GTMaterials.Realgar, 2) .dimensions('ad_astra:moon') }) @@ -191,6 +190,7 @@ const registerGTCEUBedrockOreVeins = (event) => { .material(GTMaterials.Pollucite, 1) .dimensions('ad_astra:moon') }) + */ } function registerGTCEUBedrockFluidVeins(event) { @@ -227,4 +227,152 @@ function registerGTCEUBedrockFluidVeins(event) { vein.depletionChance(1) vein.depletedYield(10) }) + + // Mars Fluid Vein - Credit to Monifactory + + const Registries = Java.loadClass("net.minecraft.core.registries.Registries") + const ResourceKey = Java.loadClass("net.minecraft.resources.ResourceKey") + const martianOasisResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/martian_oasis") + const martianAmberHillsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/amber_hills") + const martianAmberPlainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/amber_plains") + const martianMountainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/martian_mountains") + const martianRusticusHillsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/rusticus_hills") + const martianRusticusPlainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/rusticus_plains") + const martianSangnumHillsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/sangnum_hills") + const martianSangnumPlainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/sangnum_plains") + + event.add('tfg:semiheavy_ammoniacal_water', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:semiheavy_ammoniacal_water').fluid) + vein.weight(100) + vein.minimumYield(200) + vein.maximumYield(400) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(15) + }) + + event.add('tfg:liquid_carbon_dioxide', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('gtceu:liquid_carbon_dioxide').fluid) + vein.weight(15) + vein.minimumYield(20) + vein.maximumYield(350) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + // Heavy Ammonical Water in Specific Biome Credit to Monifactory from https://github.com/ThePansmith/Monifactory/blob/main/kubejs/server_scripts/worldgen/fluidVeins.js + + event.add('tfg:heavy_ammoniacal_water_oasis', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(350, martianOasisResourceKey) + vein.weight(0) + vein.minimumYield(300) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(20) + }) + + event.add('tfg:heavy_ammoniacal_water_amber_hills', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianAmberHillsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_amber_plains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianAmberPlainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_mountains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianMountainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_rusticus_hills', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianRusticusHillsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_rusticus_plains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianRusticusPlainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_sangnum_hills', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianSangnumHillsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_sangnum_plains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianSangnumPlainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + // Ammonia + + event.add('tfg:ammonia_mars_oasis', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('gtceu:ammonia').fluid) + vein.biomes(400, martianOasisResourceKey) + vein.weight(0) + vein.minimumYield(300) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(20) + }) + } \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4d7fc9cf0..03055afe0 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1362,7 +1362,7 @@ const registerGTCEURecipes = (event) => { 'ADA', 'BCB' ], { - A: '#gtceu:circuits/iv', + A: '#gtceu:circuits/ev', B: 'gtceu:ev_electric_motor', C: 'gtceu:aluminium_single_cable', D: 'gtceu:ev_centrifuge', @@ -1399,4 +1399,32 @@ const registerGTCEURecipes = (event) => { event.replaceOutput({ id: 'gtceu:cutter/treated_button' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') event.replaceOutput({ id: 'gtceu:cutter/treated_button_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') event.replaceOutput({ id: 'gtceu:cutter/treated_button_distilled_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') + + //#region Replace Recipe + + event.remove({ id : 'gtceu:assembly_line/me_pattern_buffer_proxy'}) + event.recipes.gtceu.assembly_line('tfg:me_pattern_buffer_proxy') + .itemInputs( + 'gtceu:luv_machine_hull', + '2x gtceu:luv_sensor', + '#gtceu:circuits/luv', + 'gtceu:fusion_glass', + '2x ae2:quantum_ring', + '32x gtceu:fine_europium_wire', + '32x gtceu:fine_europium_wire', + '16x megacells:accumulation_processor') + .inputFluids(Fluid.of('gtceu:lubricant', 500)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*4)) + .stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32)) + .itemOutputs('gtceu:me_pattern_buffer_proxy') + .duration(30*20) + .EUt(GTValues.VA[GTValues.ZPM]) + + event.replaceInput({ id: 'gtceu:assembly_line/me_pattern_buffer' }, 'ae2:pattern_provider', '3x expatternprovider:ex_pattern_provider') + event.replaceInput({ id: 'gtceu:assembly_line/me_pattern_buffer' }, 'ae2:interface', '3x expatternprovider:oversize_interface') + + event.replaceInput({ id: 'gtceu:shaped/large_combustion_engine' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + event.replaceInput({ id: 'gtceu:shaped/nano_chestplate_advanced' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + event.replaceInput({ id: 'gtceu:assembler/ev_large_miner' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 4103eed3f..0131d3b0e 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -690,38 +690,6 @@ function registerGTCEuMachineRecipes(event) { ["scannerResearch(java.util.function.UnaryOperator)"](b => b.researchStack(Item.of('gtceu:computer_monitor_cover')).EUt(GTValues.VA[GTValues.IV]).duration(120 * 20)) - event.remove({ id: 'gtceu:assembly_line/me_pattern_buffer' }) - event.recipes.gtceu.assembly_line('me_pattern_buffer') - .itemInputs('gtceu:luv_dual_input_hatch', - 'gtceu:luv_emitter', - '4x #gtceu:circuits/luv', - '3x ae2:pattern_provider', - '3x ae2:interface', - '4x ae2:speed_card', - '2x ae2:capacity_card', - '64x #forge:fine_wires/europium', - '32x #forge:fine_wires/europium') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 576), Fluid.of('gtceu:lubricant', 500)) - .itemOutputs('gtceu:me_pattern_buffer') - .duration(30 * 20) - .EUt(GTValues.VA[GTValues.LuV]) - ["scannerResearch(java.util.function.UnaryOperator)"](b => - b.researchStack(Item.of('gtceu:luv_dual_input_hatch')).EUt(GTValues.VA[GTValues.LuV]).duration(60 * 20)) - - event.remove({ id: 'gtceu:assembly_line/me_pattern_buffer_proxy' }) - event.recipes.gtceu.assembly_line('me_pattern_buffer_proxy') - .itemInputs('gtceu:luv_machine_hull', - '2x gtceu:luv_sensor', - '#gtceu:circuits/luv', - 'ae2:quantum_link', - '2x ae2:quantum_ring', - '64x #forge:fine_wires/europium') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 576), Fluid.of('gtceu:lubricant', 500)) - .itemOutputs('gtceu:me_pattern_buffer_proxy') - .duration(30 * 20) - .EUt(GTValues.VA[GTValues.ZPM]) - .stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32)) - event.remove({ id: 'gtceu:assembly_line/ultimate_battery' }) event.recipes.gtceu.assembly_line('ultimate_battery') .itemInputs('16x #forge:double_plates/darmstadtium', @@ -896,48 +864,7 @@ function registerGTCEuMachineRecipes(event) { event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_input_hatch' }, 'gtceu:steel_dust', '6x gtceu:steel_dust') event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_input_hatch' }, 'gtceu:steel_block', '6x gtceu:steel_ingot') - // #region Bedrock Miner - - event.recipes.gtceu.assembler('gtceu:mv_bedrock_miner') - .itemInputs('1x gtceu:hv_machine_hull', - '4x #forge:frames/steel', - '4x #gtceu:circuits/iv', - '4x gtceu:hv_electric_motor', - '4x gtceu:hv_robot_arm', - '4x gtceu:hv_conveyor_module', - '4x #forge:gears/blue_steel') - .itemOutputs('gtceu:mv_bedrock_ore_miner') - .duration(400) - .EUt(GTValues.VA[GTValues.HV]) - .circuit(2) - - event.recipes.gtceu.assembler('gtceu:hv_bedrock_miner') - .itemInputs('1x gtceu:ev_machine_hull', - '4x #forge:frames/titanium', - '4x #gtceu:circuits/luv', - '4x gtceu:luv_electric_motor', - '4x gtceu:luv_robot_arm', - '4x gtceu:luv_conveyor_module', - '4x #forge:gears/ruridit') - .itemOutputs('gtceu:hv_bedrock_ore_miner') - .duration(400) - .EUt(GTValues.VA[GTValues.IV]) - .circuit(2) - - event.recipes.gtceu.assembler('gtceu:ev_bedrock_miner') - .itemInputs('1x gtceu:iv_machine_hull', - '4x #forge:frames/tungsten_steel', - '4x #gtceu:circuits/zpm', - '4x gtceu:zpm_electric_motor', - '4x gtceu:zpm_robot_arm', - '4x gtceu:zpm_conveyor_module', - '4x #forge:gears/osmiridium') - .itemOutputs('gtceu:ev_bedrock_ore_miner') - .duration(400) - .EUt(GTValues.VA[GTValues.ZPM]) - .circuit(2) - - //#endregion + //#region Chipboard Composite event.recipes.gtceu.mixer('gtceu:chipboard_composite_wax') .itemInputs('2x #tfg:wood_dusts', @@ -1027,6 +954,30 @@ function registerGTCEuMachineRecipes(event) { .duration(2.5 * 20) .EUt(16) + event.recipes.gtceu.assembler('tfg:casings/machine_casing_stainless_evaporation') + .itemInputs('gtceu:clean_machine_casing', '4x gtceu:annealed_copper_double_wire') + .inputFluids(Fluid.of('gtceu:polyvinyl_chloride', 288)) + .itemOutputs('tfg:casings/machine_casing_stainless_evaporation') + .circuit(4) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.assembler('tfg:casings/machine_casing_mars') + .itemInputs('gtceu:clean_machine_casing', '4x #forge:double_wires/kanthal') + .inputFluids(Fluid.of('gtceu:polybenzimidazole', 288)) + .itemOutputs('tfg:casings/machine_casing_mars') + .circuit(4) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.assembler('gtceu:atomic_casing') + .itemInputs('4x #forge:dense_plates/lead', '2x #forge:plates/rtm_alloy', '#forge:frames/titanium') + .inputFluids(Fluid.of('gtceu:polyvinyl_butyral', 288)) + .itemOutputs('2x gtceu:atomic_casing') + .circuit(4) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + //#endregion //#region Large Solar Panel @@ -1151,4 +1102,149 @@ function registerGTCEuMachineRecipes(event) { .EUt(-(GTValues.V[GTValues.LuV]), 2) .circuit(2) + //#endregion + + //#region Mars Ore Line + + // Multiblock + + /* LOCKED UNTIL VENUS + + event.shaped( + 'gtceu:extraterrestrial_ore_fabricator', + [ 'USU', + 'WZW', + 'PTP'], + { + S: 'tfg:casings/machine_casing_vacuum_engine_intake', + Z: 'gtceu:iv_machine_hull', + W: '#gtceu:circuits/iv', + U: '#forge:double_plates/stellite_100', + T: '#forge:single_cables/platinum', + P: 'gtceu:iv_electric_pump' + } + ).id('gtceu:shaped/extraterrestrial_ore_fabricator') + + */ + + event.recipes.gtceu.assembler('tfg:ostrum_harvester') + .itemInputs( + '1x gtceu:ev_machine_hull', + '4x #gtceu:circuits/ev', + '4x gtceu:ev_electric_motor', + '4x #forge:rotors/black_steel', + '4x gtceu:ev_electric_pump', + '4x #forge:gears/desh') + .itemOutputs('gtceu:ostrum_harvester') + .duration(400) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(2) + + event.recipes.gtceu.assembler('tfg:moon_dust_harvester') + .itemInputs( + '1x gtceu:hv_machine_hull', + '4x #gtceu:circuits/hv', + '4x gtceu:hv_electric_motor', + '4x #forge:rotors/titanium', + '4x gtceu:hv_electric_pump', + '4x #forge:gears/rocket_alloy_t1') + .itemOutputs('gtceu:moon_dust_harvester') + .duration(400) + .EUt(GTValues.VA[GTValues.HV]) + .circuit(2) + + // Vacuum Intake + + event.shaped( + 'tfg:casings/machine_casing_vacuum_engine_intake', + [ 'USU', + 'WZW', + 'UTU'], + { + S: '#forge:tools/hammers', + T: '#forge:tools/wrenches', + W: '#forge:rotors/ultimet', + U: 'gtceu:ultimet_normal_item_pipe', + Z: 'gtceu:inert_machine_casing' + } + ).id('tfg:shaped/casing_machine_casing_vacuum_engine_intake') + + event.recipes.gtceu.assembler('tfg:casings/machine_casing_vacuum_engine_intake') + .itemInputs( + '2x #forge:rotors/ultimet', + '4x gtceu:ultimet_normal_item_pipe', + '1x gtceu:inert_machine_casing') + .itemOutputs('tfg:casings/machine_casing_vacuum_engine_intake') + .duration(50) + .EUt(GTValues.VH[GTValues.LV]) + .circuit(2) + + // Stainless Evaporation Tower - LOCKED UNTIL VENUS + + /* + + event.shaped( + 'gtceu:evaporation_tower', + [ 'TUT', + 'WZW', + 'TUT'], + { + T: '#gtceu:circuits/ev', + W: 'gtceu:hv_electric_pump', + U: '#forge:double_wires/kanthal', + Z: 'gtceu:hv_machine_hull' + } + ).id('tfg:shaped/evaporation_tower') + + */ + + //#endregion + + //#region Nuclear Controler - LOCKED UNTIL MARS + + /* + + event.shaped( + 'gtceu:fission_reactor', + [ 'TUT', + 'WZW', + 'TUT'], + { + T: 'gtceu:atomic_casing', + W: '#gtceu:circuits/ev', + U: 'gtceu:hv_field_generator', + Z: 'gtceu:ev_machine_hull' + } + ).id('tfg:shaped/fission_reactor') + + event.shaped( + 'gtceu:nuclear_fuel_factory', + [ 'TUT', + 'WZW', + 'TBT'], + { + T: 'gtceu:atomic_casing', + W: '#gtceu:circuits/ev', + U: 'gtceu:ev_emitter', + Z: 'gtceu:ev_machine_hull', + B: 'gtceu:ev_robot_arm' + } + ).id('tfg:shaped/nuclear_fuel_factory') + + event.shaped( + 'gtceu:heat_exchanger', + [ 'TUT', + 'WZW', + 'TBT'], + { + T: 'gtceu:high_temperature_smelting_casing', + W: '#gtceu:circuits/ev', + U: 'gtceu:ev_sensor', + Z: 'gtceu:ev_machine_hull', + B: 'gtceu:ev_fluid_regulator' + } + ).id('tfg:shaped/heat_exchanger') + + */ + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 855d8b072..17bde7c41 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -21,5 +21,7 @@ const registerTFGRecipes = (event) => { registerTFGStoneDustRecipes(event) registerTFGRecyclingRecipes(event) registerTFGNuclearRecipes(event) + registerTFGMarsRecipes(event) + registerTFGMoonOres(event) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.mars.js b/kubejs/server_scripts/tfg/recipes.mars.js new file mode 100644 index 000000000..1d1cbebd9 --- /dev/null +++ b/kubejs/server_scripts/tfg/recipes.mars.js @@ -0,0 +1,72 @@ + function registerTFGMarsRecipes(event) { + +const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic') + + // Ostrum Harvester + + event.recipes.gtceu.ostrum_harvester(`ostrum_harvesting`) + .perTick(true) + .inputFluids('gtceu:drilling_fluid 4') + .perTick(false) + .dimension('ad_astra:mars') + .itemOutputsRanged('gtceu:ostrum_dust',1,5) + .duration(20*5) + .EUt(GTValues.VA[GTValues.LV]); + + // Large Centrifuge Ostrum dust - SCRAP FROM MARS GOING TO VENUS + + /* + + event.recipes.gtceu.centrifuge(`ostrum_harvesting`) + .inputFluids('gtceu:bromine 100') + .itemInputs('#forge:dusts/ostrum') + .dimension('ad_astra:mars') + .chancedFluidOutputLogic($ChanceLogic.XOR) + .chancedFluidOutput('gtceu:lightweight_ostrum_vapor',6000,0) + .chancedFluidOutput('gtceu:ostrum_vapor',3000,0) + .chancedFluidOutput('gtceu:dense_ostrum_vapor',1000,0) + .duration(20*58) + .EUt(GTValues.VA[GTValues.EV], 4); + +event.recipes.gtceu.extraterrestrial_ore_fabricator('lightweight_ostrum') + .inputFluids('gtceu:lightweight_ostrum_vapor 1000') + .inputFluids(Fluid.of('gtceu:radon', 1000)) + .itemOutputsRanged('#forge:crushed_ores/tantalite',1,10) + .itemOutputsRanged('#forge:crushed_ores/bauxite',1,10) + //.itemOutputsRanged('#forge:crushed_ores/pyrope',1,10) + //.itemOutputsRanged('#forge:crushed_ores/rose_quartz',1,10) + .itemOutputsRanged('#forge:crushed_ores/thorium',1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_ruby_ore'),1,10) + .dimension('ad_astra:venus') + .duration(20*5) + .EUt(GTValues.VA[GTValues.IV]); + +event.recipes.gtceu.extraterrestrial_ore_fabricator('ostrum') + .inputFluids('gtceu:ostrum_vapor 1000') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1000)) + .itemOutputsRanged(Item.of('gtceu:crushed_chromite_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_malachite_ore'),1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_quartzite_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_gypsum_ore'),1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_electrotine_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_barite_ore'),1,10) + .dimension('ad_astra:venus') + .duration(20*5) + .EUt(GTValues.VA[GTValues.IV]); + +event.recipes.gtceu.extraterrestrial_ore_fabricator('dense_ostrum') + .inputFluids('gtceu:dense_ostrum_vapor 1000') + .inputFluids(Fluid.of('gtceu:tritiated_water', 500)) + .itemOutputsRanged('#forge:crushed_ores/uraninite',1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_certus_quartz_ore'),1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_beryllium_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_bastnasite_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_spessartine_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_silver_ore'),1,10) + .dimension('ad_astra:venus') + .duration(20*5) + .EUt(GTValues.VA[GTValues.IV]); + + */ + + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index d12eb97b4..21692b19b 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -825,7 +825,7 @@ function registerTFGMiscellaneousRecipes(event) { event.recipes.gtceu.assembler('sensor_iv') .itemInputs('gtceu:quantum_eye', '#forge:rods/iridium', '#gtceu:circuits/iv', '4x #forge:plates/tungsten_steel') - .itemOutputs('gtceu:ev_sensor') + .itemOutputs('gtceu:iv_sensor') .duration(100) .EUt(30) diff --git a/kubejs/server_scripts/tfg/recipes.moon_ores.js b/kubejs/server_scripts/tfg/recipes.moon_ores.js new file mode 100644 index 000000000..a110ed7c6 --- /dev/null +++ b/kubejs/server_scripts/tfg/recipes.moon_ores.js @@ -0,0 +1,131 @@ +// priority: 0 + +function registerTFGMoonOres(event) { + +//#region Moon Harvester + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_assurine_harvester') + .biome('tfg:moon/lunar_asurine_dense') + .itemOutputsRanged('#forge:dusts/certus_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(1) + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_chorus_dense') + .biome('tfg:moon/lunar_chorus_dense') + .itemOutputsRanged('#forge:dusts/goethe_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(2) + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_corals_dense') + .biome('tfg:moon/lunar_corals_dense') + .itemOutputsRanged('#forge:dusts/bright_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(3) + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_lights_dense') + .biome('tfg:moon/lunar_lights_dense') + .itemOutputsRanged('#forge:dusts/cassiterite_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(4) + + //#endregion + + //#region Regolith Vapor Processing + + event.recipes.gtceu.mixer('tfg:regolith_slurry_suspension') + .itemInputs('ad_astra:moon_sand', 'tfg:dry_ice') + .itemOutputs('#forge:dusts/regolith_mush') + .dimension('ad_astra:moon') + .duration(20*60) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.chemical_bath('tfg:regolith_vapor') + .itemInputs('#forge:dusts/regolith_mush') + .inputFluids('gtceu:nitrogen 1000') + .itemOutputs('#forge:dusts/silicon_dioxide') + .outputFluids('gtceu:regolith_vapor 1000') + .dimension('ad_astra:moon') + .duration(20*28) + .EUt(GTValues.VHA[GTValues.LV]) + + //#endregion + + //#region Making Dusty Ores + +const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic') + + event.recipes.gtceu.chemical_reactor('tfg:dusty_certus_reactor') + .itemInputs('#forge:dusts/certus_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .itemOutputs('gtceu:dusty_raw_certus_quartz') + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:dusty_goethite_reactor') + .itemInputs('#forge:dusts/goethe_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .itemOutputs('gtceu:dusty_raw_goethite') + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:dusty_shiny_reactor') + .itemInputs('#forge:dusts/bright_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .chancedItemOutputLogic($ChanceLogic.XOR) + .chancedOutput('gtceu:dusty_raw_diamond',2000,0) + .chancedOutput('gtceu:dusty_raw_gold',8000,0) + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:dusty_cassiterite_reactor') + .itemInputs('#forge:dusts/cassiterite_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .itemOutputs('gtceu:dusty_raw_cassiterite') + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + //#endregion + + //#region Dusty to Dust through centrifuge + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_certus_quartz') + .itemInputs('gtceu:dusty_raw_certus_quartz') + .itemOutputs('ae2:certus_quartz_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_goethite') + .itemInputs('gtceu:dusty_raw_goethite') + .chancedItemOutputLogic($ChanceLogic.XOR) + .chancedOutput('gtceu:iron_dust',5000,0) + .chancedOutput('gtceu:copper_dust',5000,0) + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_diamond') + .itemInputs('gtceu:dusty_raw_diamond') + .itemOutputs('gtceu:diamond_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_gold') + .itemInputs('gtceu:dusty_raw_gold') + .itemOutputs('gtceu:gold_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_tin') + .itemInputs('gtceu:dusty_raw_cassiterite') + .itemOutputs('gtceu:tin_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.nuclear.js b/kubejs/server_scripts/tfg/recipes.nuclear.js index 9d4aa903d..376743188 100644 --- a/kubejs/server_scripts/tfg/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/recipes.nuclear.js @@ -47,13 +47,20 @@ function registerTFGNuclearRecipes(event) { //#region Mars Water - event.recipes.gtceu.electrolyzer('mars_water') - .inputFluids(Fluid.of('tfg:semiheavy_ammoniacal_water', 1000)) + event.recipes.gtceu.centrifuge('mars_heavy_water') + .inputFluids(Fluid.of('tfg:heavy_ammoniacal_water', 1000)) .outputFluids(Fluid.of('gtceu:heavy_water', 500)) .itemOutputs('#forge:dusts/ammonium_chloride', '2x #forge:small_dusts/ammonium_chloride') .duration(20*9) .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.centrifuge('mars_semiheavy_water') + .inputFluids(Fluid.of('tfg:semiheavy_ammoniacal_water', 1000)) + .outputFluids(Fluid.of('minecraft:water', 500)) + .itemOutputs('2x #forge:tiny_dusts/ammonium_chloride') + .duration(20*9) + .EUt(GTValues.VA[GTValues.MV]) + // Martian Sludge event.recipes.gtceu.chemical_bath('dirty_hexafluorosilicic_acid') @@ -77,7 +84,7 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('gtceu:martian_sludge', 1000)) .inputFluids(Fluid.of('gtceu:formamide', 1000)) .inputFluids(Fluid.of('gtceu:radioactive_waste', 1000)) - .outputFluids(Fluid.of('gtceu:radon', 100)) + .outputFluids(Fluid.of('gtceu:radon', 1000)) .itemOutputs('#forge:dusts/nuclear_residue') .duration(20*30) .EUt(GTValues.VA[GTValues.EV]) @@ -85,7 +92,7 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.vacuum_freezer('oxidized_nuclear_residue') .itemInputs('#forge:dusts/nuclear_residue') .inputFluids(Fluid.of('gtceu:dioxygen_difluoride', 1000)) - .outputFluids(Fluid.of('minecraft:water', 10)) + .outputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1000)) .itemOutputs('#forge:dusts/oxidized_nuclear_residue') .duration(20*5) .EUt(GTValues.VA[GTValues.IV]) @@ -201,19 +208,27 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.gas_turbine('dense_steam') .inputFluids(Fluid.of('gtceu:dense_steam', 1)) - .EUt(-(32*4)) + .EUt(-(32)) .duration(20*2) //#endregion - //#region FLiBe Line + //#region FLiBe Line - SCRAP FROM MARS TO VENUS - event.recipes.gtceu.evaporation_tower('raw_rich_brine') + /* + + event.recipes.gtceu.evaporation_tower('raw_rich_brine_earth') .inputFluids(Fluid.of('tfc:spring_water', 20000)) .outputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) .duration(20*50) .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.evaporation_tower('raw_rich_brine_mars') + .inputFluids(Fluid.of('tfg:heavy_ammoniacal_water', 20000)) + .outputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .duration(20*50) + .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.chemical_reactor('hydrogen_iodide_to_hot_iodine_brine') .inputFluids(Fluid.of('gtceu:hydrogen_iodide', 1000)) .inputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) @@ -283,9 +298,13 @@ function registerTFGNuclearRecipes(event) { .duration(20*36) .EUt(GTValues.VA[GTValues.IV]) + */ + //#endregion - //#region Bromine Line + //#region Bromine Line - SCRAP FROM MARS TO VENUS + + /* event.recipes.gtceu.evaporation_tower('evaporation_brine') .inputFluids(Fluid.of('tfc:salt_water', 20000)) @@ -293,6 +312,12 @@ function registerTFGNuclearRecipes(event) { .duration(20*50) .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.evaporation_tower('evaporation_brine_mars') + .inputFluids(Fluid.of('tfg:semiheavy_ammoniacal_water', 20000)) + .outputFluids(Fluid.of('gtceu:raw_brine', 1000)) + .duration(20*50) + .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.fluid_heater('heat_brine') .inputFluids(Fluid.of("gtceu:raw_brine", 1000)) .outputFluids(Fluid.of("gtceu:hot_brine", 1000)) @@ -398,4 +423,6 @@ function registerTFGNuclearRecipes(event) { .duration(20*25) .EUt(GTValues.VA[GTValues.HV]) + */ + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 494d4dfd4..186d1ffb8 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -287,7 +287,7 @@ function registerTFGSpaceRecipes(event) { 'CHC', 'NEN' ], { - C: '#gtceu:circuits/iv', + C: '#gtceu:circuits/ev', S: 'gtceu:hv_sensor', E: 'gtceu:hv_emitter', H: 'gtceu:ev_machine_hull', diff --git a/kubejs/server_scripts/tfg/recipes.terrariums.js b/kubejs/server_scripts/tfg/recipes.terrariums.js index 68c5e64fe..2bc2b6a0e 100644 --- a/kubejs/server_scripts/tfg/recipes.terrariums.js +++ b/kubejs/server_scripts/tfg/recipes.terrariums.js @@ -150,14 +150,7 @@ function registerTFGTerrariumRecipes(event) { }).id('tfg:shaped/end_crystal') // chorus fruit - - event.recipes.gtceu.large_chemical_reactor('tfg:kovarex') - .itemInputs('40x gtceu:uranium_235_dust', '5x gtceu:uranium_dust') - .itemOutputs('41x gtceu:uranium_235_dust', '2x gtceu:uranium_dust') - .duration(600) - .EUt(GTValues.VA[GTValues.LuV]) - .circuit(2) - + // end stone diff --git a/kubejs/startup_scripts/ad_astra/materials.js b/kubejs/startup_scripts/ad_astra/materials.js index f9282a9fd..37ac4831b 100644 --- a/kubejs/startup_scripts/ad_astra/materials.js +++ b/kubejs/startup_scripts/ad_astra/materials.js @@ -41,7 +41,6 @@ const registerAdAstraMaterials = (event) => { .color(0xbd7980) .secondaryColor(0xA66C8D) .iconSet(GTMaterialIconSet.getByName('tfc_cassiterite')) - .dust() .ingot() .liquid() .blastTemp(2900, 'mid', GTValues.VA[GTValues.HV]) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index fcc65cafb..161d0b996 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -183,7 +183,12 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:mossy_marble_cobblestone', 'gtceu:marble_bricks', 'gtceu:cracked_marble_bricks', - 'gtceu:mossy_marble_bricks' + 'gtceu:mossy_marble_bricks', + + // Machine Bedrock Miner + 'gtceu:mv_bedrock_ore_miner', + 'gtceu:hv_bedrock_ore_miner', + 'gtceu:ev_bedrock_ore_miner' ]; //#endregion diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 6ed68ad78..66cf74285 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -4,6 +4,7 @@ const registerGTCEuMachines = (event) => { const $SteamMulti = Java.loadClass('com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine'); const $Tags = Java.loadClass("dev.latvian.mods.kubejs.util.Tags") + const CoilWorkableElectricMultiblockMachine = Java.loadClass("com.gregtechceu.gtceu.api.machine.multiblock.CoilWorkableElectricMultiblockMachine") //#region Nether Dome @@ -561,4 +562,133 @@ const registerGTCEuMachines = (event) => { 'gtceu:block/casings/solid/machine_casing_stainless_evaporation', 'gtceu:block/multiblock/distillation_tower') -} + //#endregion + + //#region Ore Line + + // Ostrum Harvester + + event.create('ostrum_harvester', 'multiblock') + .machine((holder) => new CoilWorkableElectricMultiblockMachine(holder)) + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('ostrum_harvester') + .recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT, (machine, recipe) => GTRecipeModifiers.crackerOverclock(machine, recipe)]) + .appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing')) + .pattern(definition => FactoryBlockPattern.start() + .aisle(' ' ,'A A', 'AAAAA', 'ACCCA', 'AAEAA', ' AAA ') + .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle(' ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' G ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle(' ' ,'A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ') + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('A', Predicates.blocks('gtceu:secure_maceration_casing')) + .where('B', Predicates.blocks('gtceu:nonconducting_casing')) + .where('C', Predicates.blocks('gtceu:nonconducting_casing') + .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2).setPreviewCount(2)) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1).setPreviewCount(1))) + .where('D', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('E', Predicates.blocks('gtceu:nonconducting_casing') + .or(Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1).setPreviewCount(1))) + .where('F', Predicates.heatingCoils()) + .where('G', Predicates.blocks('tfg:spice')) + .where('#', Predicates.air()) + .where(' ', Predicates.any()) + .build() + ) + .workableCasingModel( + 'gtceu:block/casings/gcym/nonconducting_casing', + 'gtceu:block/multiblock/distillation_tower') + + // Moon Harvester + + event.create('moon_dust_harvester', 'multiblock') + .machine((holder) => new CoilWorkableElectricMultiblockMachine(holder)) + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('moon_dust_harvester') + .recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT, (machine, recipe) => GTRecipeModifiers.crackerOverclock(machine, recipe)]) + .appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing')) + .pattern(definition => FactoryBlockPattern.start() + .aisle('A A', 'AAAAA', 'ACCCA', 'AAEAA', ' AAA ') + .aisle(' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle('A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ') + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('A', Predicates.blocks('tfg:casings/machine_casing_iron_desh')) + .where('B', Predicates.blocks('gtceu:nonconducting_casing')) + .where('C', Predicates.blocks('gtceu:nonconducting_casing') + .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1).setPreviewCount(1))) + .where('D', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('E', Predicates.blocks('gtceu:nonconducting_casing')) + .where('F', Predicates.heatingCoils()) + .where('#', Predicates.air()) + .where(' ', Predicates.any()) + .build() + ) + .workableCasingModel( + 'gtceu:block/casings/gcym/nonconducting_casing', + 'gtceu:block/multiblock/distillation_tower') + + // Extraterrestrial Ore Fabricator + + event.create('extraterrestrial_ore_fabricator', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('extraterrestrial_ore_fabricator') + .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT]) + .appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_mars')) + .pattern(definition => FactoryBlockPattern.start() + .aisle('AAAAAAAAA', 'AAAAAAAAA', 'AAAAAAAAA', ' ', ' ' ) + .aisle('BAAAAAAAA', 'B#######D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('AAAAAAAAA', 'A#######D', 'BB###BBGA', ' C###C ', ' BBHBB ' ) + .aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('A#####AFA', 'A#####AXA', 'AAAAAAAFA', ' ', ' ' ) + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('A', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2))) + .where('B', Predicates.blocks('gtceu:high_temperature_smelting_casing')) + .where('C', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('D', Predicates.blocks('gtceu:heat_vent')) + .where('E', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(6))) + .where('F', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))) + .where('G', Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1)) + .where('H', Predicates.abilities(PartAbility.EXPORT_ITEMS).setExactLimit(1)) + .where('#', Predicates.air()) + .where(' ', Predicates.any()) + .build() + ) + .shapeInfo(controller => MultiblockShapeInfo.builder() + .aisle('KKAAAAAAA', 'AAAAAAAAA', 'AAAAAAAAA', ' ', ' ' ) + .aisle('BAAAAAAAA', 'B D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('AAAAAAAAA', 'A D', 'BB BBGA', ' C C ', ' BBHBB ' ) + .aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('A AMA', 'A AXA', 'AAAAAAAAA', ' ', ' ' ) + .where('X', controller, Direction.SOUTH) + .where('A', Block.getBlock('tfg:casings/machine_casing_mars')) + .where('B', Block.getBlock('gtceu:high_temperature_smelting_casing')) + .where('C', Block.getBlock('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('D', Block.getBlock('gtceu:heat_vent')) + .where('E', GTMachines.FLUID_IMPORT_HATCH[GTValues.EV], Direction.SOUTH) + .where('G', GTMachines.MUFFLER_HATCH[GTValues.LV], Direction.UP) + .where('H', GTMachines.ITEM_EXPORT_BUS[GTValues.EV], Direction.UP) + .where('M', GTMachines.AUTO_MAINTENANCE_HATCH, Direction.SOUTH) + .where('K', GTMachines.ENERGY_INPUT_HATCH[GTValues.HV], Direction.NORTH) + .where(' ', Block.getBlock('minecraft:air')) + .build() + ) + + .workableCasingModel( + 'tfg:block/casings/machine_casing_mars', + 'gtceu:block/machines/thermal_centrifuge') + +} \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index d066405f5..692a1384e 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -29,6 +29,7 @@ const registerGTCEuMaterialModification = (event) => { GENERATE_DOUBLE_INGOTS, HAS_SMALL_TFC_ORE, HAS_SMALL_NATIVE_TFC_ORE, + GENERATE_DUSTY_ORES, } = TFGMaterialFlags const { @@ -166,6 +167,15 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Tin.addFlags(GENERATE_DOUBLE_INGOTS); GTMaterials.Zinc.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_BOLT_SCREW); GTMaterials.SterlingSilver.addFlags(GENERATE_DOUBLE_INGOTS); + + // /* Generate Dusty Ores for Infinite Ores + + GTMaterials.Goethite.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Diamond.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.CertusQuartz.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Gold.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Cassiterite.addFlags(GENERATE_DUSTY_ORES); + // // /* Имеют инструменты, броню TFC, двойные слитки */ GTMaterials.Copper.addFlags(GENERATE_DOUBLE_INGOTS, HAS_TFC_TOOL, HAS_TFC_ARMOR, HAS_TFC_UTILITY, CAN_BE_UNMOLDED); @@ -258,6 +268,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Silicon.addFlags(GENERATE_DENSE); + GTMaterials.RTMAlloy.addFlags(GENERATE_DENSE); + GTMaterials.Lead.addFlags(GENERATE_DENSE); + GTMaterials.Quartzite.addFlags(GENERATE_ROD); GTMaterials.TreatedWood.addFlags(GENERATE_LONG_ROD); diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index c34118ad5..94554dc48 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -72,4 +72,28 @@ const registerGTCEuRecipeTypes = (event) => { .setProgressBar(GuiTextures.PROGRESS_BAR_DISTILLATION_TOWER, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.BATH) + event.create('ostrum_harvester') + .category('ostrum_harvester') + .setEUIO('in') + .setMaxIOSize(0, 1, 1, 0) + .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.JET_ENGINE) + + event.create('moon_dust_harvester') + .category('moon_dust_harvester') + .setEUIO('in') + .setMaxIOSize(1, 1, 0, 0) + .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.JET_ENGINE) + + event.create('extraterrestrial_ore_fabricator') + .category('extraterrestrial_ore_fabricator') + .setEUIO('in') + .setMaxIOSize(0, 6, 2, 0) + .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.BATH) + } diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index c73d7b257..8da674a2a 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -32,6 +32,21 @@ const registerTFGBlocks = (event) => { .particleCount(2) .particleForced(false) + event.create('tfg:spice', 'tfg:particle_emitter') + .textureAll('tfg:block/sand_spice') + .soundType('sand') + .hardness(1) + .resistance(1) + .unbreakable() + .tagBlock('tfcambiental:hot_stuff') + .lightLevel(0.1) + .mapColor('color_white') + .particleOffset(0, 2, 0) + .particleVelocity(0.05, 0, 0.05) + .particle('electric_spark') + .particleCount(3) + .particleForced(false) + // #region Machine Casings global.TFG_MACHINE_CASINGS.forEach(type => { @@ -56,6 +71,16 @@ const registerTFGBlocks = (event) => { .tagBlock('minecraft:mineable/wrench') .mapColor('color_light_gray') + event.create('tfg:casings/machine_casing_vacuum_engine_intake', 'gtceu:active') + .simple('tfg:block/casings/machine_casing_vacuum_engine_intake') + .translationKey(`block.tfg.casings.machine_casing_vacuum_engine_intake`) + .soundType('metal') + .resistance(6).hardness(5) + .tagBlock('mineable/pickaxe') + .tagBlock('forge:mineable/wrench') + .requiresTool(true) + .mapColor('color_light_gray') + //#endregion // #region Decorative vases diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index d7e7599e6..a961968dc 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -32,6 +32,13 @@ const registerTFGFluids = (event) => { .noBlock() //#region Mars + + event.create('tfg:heavy_ammoniacal_water') + .thinTexture(0x08733f) + .bucketColor(0x08733f) + .temperature(236) + .noBlock() + //#endregion //#region Venus @@ -51,4 +58,5 @@ const registerTFGFluids = (event) => { .temperature(1000) .renderType('translucent') //#endregion + } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 6049828a5..b314a0370 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -9,7 +9,6 @@ const registerTFGItems = (event) => { registerTFGDeprecatedItems(event) registerTFGFoodItems(event) - registerTFGNuclearItems(event) // #region Electronics event.create('tfg:unfinished_electron_tube', 'create:sequenced_assembly') @@ -389,4 +388,7 @@ const registerTFGItems = (event) => { event.create('tfg:photo_cell_t1') .translationKey("item.tfg.basic.photovoltaic.cell") .texture('tfg:item/photo_cell_t1') + + //#endregion + } diff --git a/kubejs/startup_scripts/tfg/items.nuclear.js b/kubejs/startup_scripts/tfg/items.nuclear.js deleted file mode 100644 index b7af34d20..000000000 --- a/kubejs/startup_scripts/tfg/items.nuclear.js +++ /dev/null @@ -1,6 +0,0 @@ -// priority: 0 - -function registerTFGNuclearItems(event) { - - -} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index c4c2c0256..9f895bc1f 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -330,4 +330,70 @@ const registerTFGMaterials = (event) => { .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(293)) .color(0x82a6ce) .formula('HI') + + //#endregion + + //# Mars Ore Line + + event.create('lightweight_ostrum_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(760)) + .formula('(?)') + + event.create('ostrum_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(815)) + .formula('(?)') + + event.create('dense_ostrum_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(930)) + .formula('(?)') + + event.create('residual_radioactive_concoction') + .liquid(new GTFluidBuilder().customStill().temperature(450)) + .formula('(?)') + + //#endregion + + // Moon Ore Line + + event.create('regolith_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(727)) + + event.create('tfg:certus_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.CERTUS) + .color('0xc1e6e4') + .secondaryColor('0x7a5225') + + event.create('tfg:goethe_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.METALLIC) + .color('0xb0af5b') + .secondaryColor('0x7a5225') + + event.create('tfg:bright_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.SHINY) + .color('0xf0efe9') + .secondaryColor('0xffffff') + + event.create('tfg:cassiterite_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.METALLIC) + .color('0xbab6b7') + .secondaryColor('0x7a5225') + + // Reactant to Ore line + + event.create('tfg:regolith_mush') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.WOOD) + .color('0xa2cde0') + .secondaryColor('0x7a5225') + + } diff --git a/kubejs/startup_scripts/tfg/materials.nuclear.js b/kubejs/startup_scripts/tfg/materials.nuclear.js index 3ca41eee1..2adc6678d 100644 --- a/kubejs/startup_scripts/tfg/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/materials.nuclear.js @@ -129,14 +129,6 @@ const registerTFGNuclearMaterials = (event) => { //#region Dust - event.create('tfg:mars_stone_dust') - .dust() - .components('2x deuterium', '1x oxygen') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xE79B07) - .secondaryColor(0x5A4316) - .iconSet(GTMaterialIconSet.ROUGH) - event.create('tfg:nuclear_residue') .dust() .formula('(?)') From 55b56630ebf7a654428d4ea1a5b135337e6a448c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 12:49:53 +0100 Subject: [PATCH 25/52] changelist for tom, also removed all the redundant dusty_raw_ore item models and the old bedrock ore function --- CHANGELOG.md | 3 + .../material_sets/bright/dusty_raw_ore.json | 8 --- .../material_sets/certus/dusty_raw_ore.json | 8 --- .../material_sets/diamond/dusty_raw_ore.json | 8 --- .../material_sets/fine/dusty_raw_ore.json | 8 --- .../material_sets/metallic/dusty_raw_ore.json | 8 --- .../material_sets/quartz/dusty_raw_ore.json | 8 --- .../material_sets/ruby/dusty_raw_ore.json | 8 --- .../material_sets/shiny/dusty_raw_ore.json | 8 --- .../material_sets/tfc_gold/dusty_raw_ore.json | 8 --- .../tfc_realgar/dusty_raw_ore.json | 8 --- kubejs/server_scripts/gregtech/data.js | 71 ------------------- kubejs/server_scripts/main_server_script.js | 4 -- 13 files changed, 3 insertions(+), 155 deletions(-) delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 227b659c8..2c857a41e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Complete rework of prospector's picks. (#1594) @Redeix - Removed the mod that was causing placed entities to sometimes not spawn - Removed energy P2P (#1661) @TomPlop @BlueBoat29 +- Removed GT bedrock miners, replaced with a new system for Moon infinites (#1569) @TomPlop ### Changes - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie @@ -21,6 +22,8 @@ - Added IV fridge, and IV-UV aqueous accumulator, food processor, food oven, and gas compressor machines @Pyritie - Added machine recipes for the wrought iron grill @Pyritie - Added recipes for redyeing/bleaching shipping containers (#1631) @Pyritie +- Adjusted recipes for ME Interface and Pattern Provider for consistency (#1569) @TomPlop +- Changed the cost of the ME Quantum Tunnel (#1569) @TomPlop ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index db04fc032..1721efdff 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -122,77 +122,6 @@ const registerGTCEUMetals = (event) => { event.metal('gtceu:aluminium_silicate', 1540, 0.00857, '#forge:ingots/aluminium_silicate', null, null, 1, 'tfg:aluminium_silicate') } - -const registerGTCEUBedrockOreVeins = (event) => { -/* - // Tin, Magnesium - event.add('tfg:moon_tin', vein => { - vein.weight(75) - .size(2) - .yield(1, 4) - .material(GTMaterials.Cassiterite, 5) - .material(GTMaterials.Tin, 2) - .material(GTMaterials.Olivine, 1) - .dimensions('ad_astra:moon') - }) - - // Iron, Gold, Magnesium - event.add('tfg:moon_magnetite', vein => { - vein.weight(75) - .size(2) - .yield(1, 4) - .material(GTMaterials.Magnetite, 8) - .material(GTMaterials.Gold, 3) - .material(GTMaterials.Olivine, 1) - .dimensions('ad_astra:moon') - }) - - // Copper, Arsenic, Tin - event.add('tfg:moon_copper', vein => { - vein.weight(100) - .size(2) - .yield(1, 4) - .material(GTMaterials.Chalcopyrite, 10) - .material(GTMaterials.Zeolite, 4) - .material(GTMaterials.Cassiterite, 3) - .dimensions('ad_astra:moon') - }) - - // Certus Quartz, Barium - event.add('tfg:moon_certus', vein => { - vein.weight(20) - .size(1) - .yield(1, 2) - .material(GTMaterials.CertusQuartz, 6) - .material(GTMaterials.Barite, 2) - .material(GTMaterials.Quartzite, 7) - .dimensions('ad_astra:moon') - }) - - // Asbestos, Tin, Calcium - event.add('tfg:moon_asbestos', vein => { - vein.weight(100) - .size(2) - .yield(1, 5) - .material(GTMaterials.Asbestos, 3) - .material(GTMaterials.CassiteriteSand, 4) - .material(GTMaterials.Diatomite, 1) - .dimensions('ad_astra:moon') - }) - - // Mica - Talc Silicon Aluminium Potassium Fluorine Caesium - event.add('tfg:moon_mica', vein => { - vein.weight(50) - .size(1) - .yield(1, 3) - .material(GTMaterials.Mica, 5) - .material(GTMaterials.Kyanite, 2) - .material(GTMaterials.Pollucite, 1) - .dimensions('ad_astra:moon') - }) - */ -} - function registerGTCEUBedrockFluidVeins(event) { event.add('tfg:moon_helium_3', vein => { diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index c2af044ab..46f6bc168 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -187,10 +187,6 @@ GTCEuServerEvents.oreVeins(event => { event.removeAll() }) -GTCEuServerEvents.bedrockOreVeins(event => { - registerGTCEUBedrockOreVeins(event) -}) - GTCEuServerEvents.fluidVeins(event => { registerGTCEUBedrockFluidVeins(event) }) From bbdeb9ba12648cfe4277312afa17bb0af8ae86b2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 15:10:26 +0100 Subject: [PATCH 26/52] reduced food oven recipes from 1A LV to slightly-less-than-1A LV --- kubejs/server_scripts/tfg/recipes.food.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index b57371354..da3ff0b5d 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -97,7 +97,7 @@ function registerTFGFoodRecipes(event) { * @param {boolean?} isFirmaDynamic */ function cookingRecipe(id, input, out, fluid, isFirmaDynamic) { - return registerFoodRecipe("food_oven", id, 300, 32, "", { + return registerFoodRecipe("food_oven", id, 300, GTValues.VA[GTValues.LV], "", { itemInputs: [input], itemOutputs: [out], fluidInputs: (fluid === undefined) ? [] : [fluid], @@ -599,7 +599,7 @@ function registerTFGFoodRecipes(event) { cookingRecipe("dried_seaweed_b", "tfc:groundcover/seaweed", "tfc:food/dried_seaweed") // Vinegar - processorRecipe('vinegar_alcohol', 600, 32, { + processorRecipe('vinegar_alcohol', 600, GTValues.VA[GTValues.LV], { circuit: 5, itemInputs: ['#tfc:foods/fruits'], fluidInputs: ['#tfc:alcohols 250'], From 0e151376eafd9b54e47ab9ae87f2a3a3ee359f44 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:21:47 +0100 Subject: [PATCH 27/52] fixed alabaster --- CHANGELOG.md | 1 + kubejs/server_scripts/tfc/recipes.removes.js | 1 + kubejs/server_scripts/tfg/recipes.rocks.js | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c857a41e..eaf7484b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Added recipes for redyeing/bleaching shipping containers (#1631) @Pyritie - Adjusted recipes for ME Interface and Pattern Provider for consistency (#1569) @TomPlop - Changed the cost of the ME Quantum Tunnel (#1569) @TomPlop +- Alabaster is now renewable via rock breaker @gustovafing ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index 95ee811ee..95af557e8 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -150,6 +150,7 @@ function removeTFCRecipes(event) { event.remove({ id: 'tfc:crafting/vanilla/redstone/minecart' }) event.remove({ id: 'tfc:crafting/cake' }) event.remove({ id: 'tfc:crafting/pumpkin_chunks' }) + event.remove({ id: 'tfc:crafting/alabaster_brick' }) event.remove({ id: /^tfc:crafting\/dough\/.*/ }) diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index 6118e4eb9..519d5f9e4 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -797,15 +797,15 @@ function registerTFGRockRecipes(event) { //#region Alabaster - event.recipes.gtceu.rock_breaker("tfg:alabaster") + event.recipes.gtceu.rock_breaker("tfg:alabaster") .notConsumable("tfc:alabaster/raw") .itemOutputs("tfc:alabaster/raw") .duration(16) .EUt(7) - event.recipes.gtceu.cutter("tfg:raw_alabaster_to_bricks") - .inputItems("tfc:alabaster/raw") - .outputItems("tfc:alabaster_brick", 4) + event.recipes.gtceu.cutter("tfg:raw_alabaster_to_bricks") + .itemInputs("tfc:alabaster/raw") + .itemOutputs("4x tfc:alabaster_brick") .duration(40) .EUt(2) From acc03bbe7209fc5e794a21aff988dfaf0cdc8e7c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:22:04 +0100 Subject: [PATCH 28/52] removed portable energy interface because it doesn't work with FE converters --- kubejs/startup_scripts/create_additions/constants.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index c17400028..8cee92602 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -34,5 +34,6 @@ global.CREATE_ADDITIONS_DISABLED_ITEMS = [ 'createaddition:copper_spool', 'createaddition:festive_spool', 'createaddition:small_light_connector', - 'createaddition:electrum_block' + 'createaddition:electrum_block', + 'createaddition:portable_energy_interface' ]; From 46b6a2da60b0939b0c5bd5a506c2ec0922b4068c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:27:18 +0100 Subject: [PATCH 29/52] gregtech papyrus tweaks --- kubejs/server_scripts/minecraft/recipes.js | 9 ++++++++- kubejs/server_scripts/tfg/recipes.miscellaneous.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 92108d98c..16a2df8f5 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -147,14 +147,21 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.chemical_bath('paper_from_papyrus_distilled') .itemInputs('tfc:papyrus') .inputFluids(Fluid.of('gtceu:distilled_water', 100)) - .itemOutputs('minecraft:paper') + .itemOutputs('4x tfc:soaked_papyrus_strip') .duration(100) .EUt(7) event.recipes.gtceu.chemical_bath('paper_from_papyrus') .itemInputs('tfc:papyrus') .inputFluids("#tfg:clean_water 100") + .itemOutputs('4x tfc:soaked_papyrus_strip') + .duration(100) + .EUt(7) + + event.recipes.gtceu.assembler('papyrus_strips') + .itemInputs('4x tfc:soaked_papyrus_strip') .itemOutputs('minecraft:paper') + .circuit(1) .duration(100) .EUt(7) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 21692b19b..3f96d316b 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -880,6 +880,7 @@ function registerTFGMiscellaneousRecipes(event) { ) .inputFluids(Fluid.of('gtceu:glue', 50)) .itemOutputs('tfg:harvest_basket') + .circuit(2) .duration(100) .EUt(GTValues.VA[GTValues.ULV]) From 7b3f4e8726a960c211c644d6e11a072807fbc20a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:53:02 +0100 Subject: [PATCH 30/52] fix #1672 --- CHANGELOG.md | 1 + kubejs/server_scripts/gregtech/recipes.materials.js | 12 ++++++++++++ kubejs/startup_scripts/tfc/constants.js | 3 +-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eaf7484b1..a625b18e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ - Fixed using the grappling hook on a ladder killing you (#106) @Zippity - Added more missing food processor recipes (#1632, #1638) @Pyritie - Fixed a few stuck quests (#1667, #1666) @Wicpar +- Fixed inconsistent quern and macerator recipes for small tfc ores (#1672) @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index cc7a5edee..b98be1958 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -368,6 +368,15 @@ function registerGTCEUMetalRecipes(event) { .duration(material.getMass()) .category(GTRecipeCategories.ORE_CRUSHING) .EUt(GTValues.VA[GTValues.ULV]) + + let tfcName = material.getName(); + if (material === GTMaterials.Bismuth) + tfcName = "bismuthinite"; + else if (material === GTMaterials.YellowLimonite) + tfcName = "limonite"; + + event.recipes.tfc.quern(smallDust, smallOre) + .id(`tfc:quern/small_${tfcName}`) } /** @@ -385,6 +394,9 @@ function registerGTCEUMetalRecipes(event) { .duration(material.getMass()) .category(GTRecipeCategories.ORE_CRUSHING) .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.tfc.quern(smallDust, smallNativeOre) + .id(`tfc:quern/small_native_${material.getName()}`) } /** diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index dd39c1ced..2f8c73dff 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -960,8 +960,7 @@ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ { input: '#forge:dusts/borax', output: '4x tfc:powder/flux', name: 'flux_powder' }, { input: '#forge:dusts/soda_ash', output: '4x tfc:powder/soda_ash', name: 'soda_ash' }, { input: 'gtceu:charcoal_dust', output: '2x tfc:powder/charcoal', name: 'charcoal' }, - { input: 'tfc:ore/sylvite', output: '4x tfc:powder/sylvite', name: 'sylvite' }, - { input: 'firmalife:ore/small_chromite', output: 'gtceu:small_chromite_dust', name: 'chromite' } + { input: 'tfc:ore/sylvite', output: '4x tfc:powder/sylvite', name: 'sylvite' } ]; global.TFC_GRAINS = [ From e76bed1b256b2879fac3d3c20c16f3897f392c6f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:59:42 +0100 Subject: [PATCH 31/52] langs --- kubejs/assets/gtceu/lang/en_us.json | 11 +++ kubejs/assets/gtceu/lang/uk_ua.json | 2 + kubejs/assets/tfc/lang/uk_ua.json | 3 + kubejs/assets/tfg/lang/en_us.json | 5 ++ kubejs/assets/tfg/lang/uk_ua.json | 100 ++++++++++++++++++++++------ 5 files changed, 101 insertions(+), 20 deletions(-) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index cee31871e..203ad05e9 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -13,6 +13,9 @@ "block.gtceu.heat_exchanger": "Heat Exchanger", "block.gtceu.fission_reactor": "Fission Reactor", "block.gtceu.evaporation_tower": "Evaporation Tower", + "block.gtceu.ostrum_harvester": "Ostrum Harvester", + "block.gtceu.moon_dust_harvester": "Moon Dust Harvester", + "block.gtceu.extraterrestrial_ore_fabricator": "Extraterrestrial Ore Fabricator", "block.gtceu.copper_crate": "Copper Crate", "block.gtceu.copper_drum": "Copper Drum", "block.gtceu.black_bronze_crate": "Black Bronze Crate", @@ -35,6 +38,9 @@ "gtceu.heat_exchanger": "Heat Exchanger", "gtceu.fission_reactor": "Fission Reactor", "gtceu.evaporation_tower": "Evaporation Tower", + "gtceu.ostrum_harvester": "Ostrum Harvester", + "gtceu.moon_dust_harvester": "Moon Dust Harvester", + "gtceu.extraterrestrial_ore_fabricator": "Extraterrestrial Ore Fabricator", "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", "item.gtceu.small_wood_dust": "Small Pile of Softwood Pulp", "item.gtceu.wood_dust": "Softwood Pulp", @@ -140,6 +146,11 @@ "material.gtceu.plutonium_pellet": "Plutonium Pellet", "material.gtceu.uranium_pellet": "Uranium Pellet", "material.gtceu.thorium_pellet": "Thorium Pellet", + "material.gtceu.residual_radioactive_concoction": "Residual Radioactive Concoction", + "material.gtceu.regolith_vapor": "Regolith Vapor", + "material.gtceu.dense_ostrum_vapor": "Dense Ostrum Vapor", + "material.gtceu.lightweight_ostrum_vapor": "Lightweight Ostrum Vapor", + "material.gtceu.ostrum_vapor": "Ostrum Vapor", "metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust", "metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore", "item.gtceu.tool.behavior.silk_ice": "Silk harvests Packed Ice", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index 4dda465b9..d62cb2589 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -87,6 +87,8 @@ "item.gtceu.treated_wood_plate": "Оброблена ДВП середньої щільності", "item.gtceu.wood_plate": "ДВП середньої щільності", "item.gtceu.treated_wood_dust": "Оброблений композит на основі ДСП", + "item.gtceu.small_treated_wood_dust": "Невелика купа обробленого деревостружкового композиту", + "item.gtceu.tiny_treated_wood_dust": "Маленька купа обробленого деревостружкового композиту", "material.gtceu.ice": "Крижана каша", "material.gtceu.damascus_steel": "Свиняча сталь", "material.gtceu.cooperite": "Куперит", diff --git a/kubejs/assets/tfc/lang/uk_ua.json b/kubejs/assets/tfc/lang/uk_ua.json index dede5e361..43c8df416 100644 --- a/kubejs/assets/tfc/lang/uk_ua.json +++ b/kubejs/assets/tfc/lang/uk_ua.json @@ -3,6 +3,9 @@ "block.tfc.fluid.salt_water": "Морська Вода", "block.tfc.cauldron.salt_water": "Котел з морською водою", "fluid.tfc.salt_water": "Морська Вода", + "block.fluid.tfc.salt_water": "Морська Вода", + "fluid.tfc.river_water": "Річкова вода", + "block.fluid.tfc.river_water": "Річкова вода", "item.tfc.bucket.salt_water": "Відро морської води", "item.tfc.powder.saltpeter": "Порошок Селітри", "item.tfc.powder.sulfur": "Сірчаний Порошок", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index cae8874f2..d999d8baf 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -658,6 +658,11 @@ "material.tfg.nuclear_residue": "Nuclear Residue", "material.tfg.oxidized_nuclear_residue": "Oxidized Nuclear Residue", "material.tfg.refined_nuclear_residue": "Refined Nuclear Residue", + "material.tfg.certus_regolith": "Certus Regolith", + "material.tfg.goethe_regolith": "Goethe Regolith", + "material.tfg.bright_regolith": "Bright Regolith", + "material.tfg.cassiterite_regolith": "Cassiterite Regolith", + "material.tfg.regolith_mush": "Regolith Mush", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", "ore_vein.tfg.deep_gold": "Gold (Deep)", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 932f5c4a4..2c29801b2 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -199,29 +199,52 @@ "block.tfg.mv_aqueous_accumulator": "§bРозширений Водний Акумулятор§r", "block.tfg.hv_aqueous_accumulator": "§6Розширений Водний Акумулятор II§r", "block.tfg.ev_aqueous_accumulator": "§5Розширений Водний Акумулятор III§r", + "block.tfg.iv_aqueous_accumulator": "§9Elite Aqueous Accumulator§r", + "block.tfg.luv_aqueous_accumulator": "§dЕлітний Водяний Акумулятор II§r", + "block.tfg.zpm_aqueous_accumulator": "§cЕлітний Водяний Акумулятор III§r", + "block.tfg.uv_aqueous_accumulator": "§3Абсолютний Водяний Акумулятор§r", "block.tfg.electric_greenhouse": "Електрична теплиця", "block.tfg.lv_food_processor": "Базовий Кухонний Комбайн", "block.tfg.mv_food_processor": "§bУдосконалений Кухонний Комбайн§r", "block.tfg.hv_food_processor": "§6Удосконалений Кухонний Комбайн II§r", "block.tfg.ev_food_processor": "§6Удосконалений Кухонний Комбайн III§r", + "block.tfg.iv_food_processor": "§9Елітний Харчопереробник§r", + "block.tfg.luv_food_processor": "§dЕлітний Харчопереробник II§r", + "block.tfg.zpm_food_processor": "§cЕлітний Харчопереробник III§r", + "block.tfg.uv_food_processor": "§3Абсолютний Харчопереробник§r", "block.tfg.lv_food_oven": "Базова Електрична Духова Шафа", "block.tfg.mv_food_oven": "§bУдосконалена Електрична Духова Шафа§r", "block.tfg.hv_food_oven": "§6Удосконалена Електрична Духова Шафа III§r", "block.tfg.ev_food_oven": "§6Удосконалена Електрична Духова Шафа III§r", + "block.tfg.iv_food_oven": "§9Елітна Електрична Піч§r", + "block.tfg.luv_food_oven": "§dЕлітна Електрична Піч II§r", + "block.tfg.zpm_food_oven": "§cЕлітна Електрична Піч III§r", + "block.tfg.uv_food_oven": "§3Абсолютна Електрична Піч§r", "block.tfg.lv_food_refrigerator": "Базовий Холодильник", "block.tfg.mv_food_refrigerator": "§bУдосконалений Холодильник§r", "block.tfg.hv_food_refrigerator": "§6Удосконалений Холодильник II§r", "block.tfg.ev_food_refrigerator": "§5Удосконалений Холодильник III§r", + "block.tfg.iv_food_refrigerator": "§9Елітний Холодильник§r", "block.tfg.lv_gas_pressurizer": "Базовий газовий пресуризатор", "block.tfg.mv_gas_pressurizer": "§bПокращений газовий пресуризатор§r", "block.tfg.hv_gas_pressurizer": "§bПокращений газовий пресуризатор II§r", "block.tfg.ev_gas_pressurizer": "§bПокращений газовий пресуризатор III§r", + "block.tfg.iv_gas_pressurizer": "§9Елітний Газовий Пресуризатор§r", + "block.tfg.luv_gas_pressurizer": "§dЕлітний Газовий Пресуризатор II§r", + "block.tfg.zpm_gas_pressurizer": "§dЕлітний Газовий Пресуризатор III§r", + "block.tfg.uv_gas_pressurizer": "§3Абсолютний Газовий Пресуризатор III§r", "block.tfg.semiheavy_ammoniacal_water": "Термохімічно збагачена амоніачна напівважка вода", "block.tfg.grass.mars_dirt": "Марсіанський ґрунт", "block.tfg.grass.mars_farmland": "Марсіанське поле", "block.tfg.grass.amber_mycelium": "Бурштиновий міцелій", "block.tfg.grass.rusticus_mycelium": "Міцелій Rusticus", "block.tfg.grass.sangnum_mycelium": "Сангнумний міцелій", + "block.tfg.saplings.crimson": "Багряний гриб", + "block.tfg.saplings.warped": "Покручений гриб", + "block.tfg.saplings.alphacene": "Альфаценовий гриб", + "block.tfg.saplings.aeronos": "Аеронський гриб", + "block.tfg.saplings.strophar": "Строфарський гриб", + "block.tfg.saplings.glacian": "Глаціанський гриб", "block.tfg.electromagnetic_accelerator": "Електромагнітний прискорювач", "block.tfg.superconductor_coil_large": "Велика надпровідна котушка", "block.tfg.superconductor_coil_small": "Мала надпровідна котушка", @@ -328,6 +351,9 @@ "block.tfg.sandstone.stairs.smooth.fluorapatite.yellow": "Сходи з гладкого жовтого флуорапатитового пісковику", "block.tfg.sandstone.fluorapatite.yellow": "Тесаний жовтий флуорапатитовий пісковик", "block.tfg.sandstone.smooth.chiseled.fluorapatite.yellow": "Різьблений жовтий флуорапатитовий пісковик", + "block.tfg.large_nest_box": "Велике багряне гніздо", + "tfg.block_entity.large_nest_box": "Велика гніздова скринька", + "block.tfg.large_nest_box_warped": "Велике покручене гніздо", "fluid.tfg.nether_slurry": "Незерський шлам", "fluid.tfg.enriched_nether_slurry": "Збагачений незерський шлам", "fluid.tfg.ender_slurry": "Ендерський шлам", @@ -749,12 +775,12 @@ "tfg.tooltip.moon_rabbit_variant.cyan": "Хутро кольору морської піни", "tfg.tooltip.moon_rabbit_variant.purple": "Лавандове хутро", "tfg.tooltip.moon_rabbit_variant.sofu": "Пломбірне хутро", - "entity.tfg.glacian_ram.male": "Glacian Ram", - "entity.tfg.glacian_ram.female": "Glacian Ewe", - "tfg.tooltip.attribution.glacian_ram": "§9§oCredit: Ad Astra", - "entity.tfg.sniffer.male": "Sniffer", - "entity.tfg.sniffer.female": "Sniffer", - "tfg.tooltip.attribution.sniffer": "§9§oCredit: Minecraft", + "entity.tfg.glacian_ram.male": "Глаціанський баран", + "entity.tfg.glacian_ram.female": "Глаціанська вівця", + "tfg.tooltip.attribution.glacian_ram": "§9§oАвтор: Ad Astra", + "entity.tfg.sniffer.male": "Сніффер", + "entity.tfg.sniffer.female": "Сніффер", + "tfg.tooltip.attribution.sniffer": "§9§oАвтор: Minecraft", "item.treetap.tap": "Застарілий предмет, створіть для оновлення", "item.gtceu.zinc_ingot": "Застарілий предмет, створіть для оновлення", "item.gtceu.brass_ingot": "Застарілий предмет, створіть для оновлення", @@ -894,6 +920,40 @@ "tooltip.tfg.ore_prospector_mode_vein": "per-vein", "tooltip.tfg.ore_prospector_mode_block": "per-block", "tfg.hangglider.disabled_dimension": "Тут не можна використовувати дельтаплан!", + "tfg.tooltip.nametag": "§7Використовується на столі переписування разом із предметом для його іменування або з чорною фарбою для іменування мітки.", + "tfg.tooltip.yeast_starter": "§7Створено з сушених фруктів", + "tfg.tooltip.beehive": "§7Потрібно заповнити порожніми рамками та оточити квітами, щоб привабити бджіл.", + "tfg.tooltip.obsolete.tree_tap": "§4Застаріле§f: Замінено на AFC TreeTap, можна створити з цього предмета, просто поклавши його на верстак!", + "tfg.tooltip.obsolete.fridge": "§4Застаріле§f: Замінено на TFG Refrigerator, можна створити з цього предмета, просто поклавши його на верстак!", + "tfg.tooltip.blaze_burner": "§cНаджар§r §7за допомогою коксу, антрациту або бездоганних і вишуканих вугільних самоцвітів.", + "tfg.tooltip.machine.perfect_overclock": "Ця машина має §2Ідеальний розгін§r!", + "tfg.tooltip.nether_dome_1": "§7Штучне середовище для імітації Нижнього світу.", + "tfg.tooltip.machine.customize_interior": "§7Інтер'єр можна налаштувати! Перевірте попередній перегляд мультиблоку в JEI.", + "tfg.tooltip.end_dome_1": "§7Штучне середовище для імітації Краю.", + "tfg.tooltip.armor.copper_diving_suit_warmth": "§7Тепло: -1", + "tfg.tooltip.armor.copper_diving_suit_insulation": "§7Ізоляція: +1", + "tfg.tooltip.armor.netherite_diving_suit_warmth": "§7Тепло: -2", + "tfg.tooltip.armor.netherite_diving_suit_insulation": "§7Ізоляція: +9", + "tfg.tooltip.armor.netherite_diving_suit_set": "§7Одягніть повний комплект, щоб стати §eСтійким до спеки§7 від навколишньої температури.", + "tfg.tooltip.armor.nanomuscle_warmth": "§7Тепло: 0", + "tfg.tooltip.armor.nanomuscle_insulation": "§7Ізоляція: +10", + "tfg.tooltip.armor.nanomuscle_set": "§7Одягніть повний комплект, щоб стати §eПовністю ізольованим§7 від навколишньої температури.", + "tfg.tooltip.armor.quarktech_warmth": "§7Тепло: 0", + "tfg.tooltip.armor.quarktech_insulation": "§7Ізоляція: +10", + "tfg.tooltip.armor.quarktech_set": "§7Одягніть повний комплект, щоб стати §eПовністю ізольованим§7 від навколишньої температури.", + "tfg.tooltip.armor.space_suit_warmth": "§7Тепло: 0", + "tfg.tooltip.armor.space_suit_insulation": "§7Ізоляція: +10", + "tfg.tooltip.armor.space_suit_set": "§7Одягніть повний комплект, щоб стати §eПовністю ізольованим§7 від навколишньої температури.", + "tfg.tooltip.support.tier1": "§79 x 5 x 9", + "tfg.tooltip.support.tier2": "§717 x 9 x 17", + "tfg.tooltip.support.tier3": "§733 x 13 x 33", + "tfg.tooltip.vessels": "§cМакс: 3024mB", + "tfg.tooltip.solar_panel.single": "Виробляє §6256 FE/t§r (64 EU/t) на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.solar_panel.large_tier1": "Гігантська структура, що виробляє від §61024 до 4096 EU/t§r на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.solar_panel.large_tier2": "Гігантська структура, що виробляє від §64096 до 16384 EU/t§r на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.solar_panel.large_tier3": "Гігантська структура, що виробляє від §616384 до 65536 EU/t§r на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.petrified_egg": "§7Потребує магми для інкубації", + "tfg.tooltip.obsolete.depreciated": "§cЗастаріле, більше не створюється", "tfc.jei.flint_knapping": "Обробка Кременю", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Фарбування", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "Фарбування", @@ -1013,7 +1073,7 @@ "quests.ae2.subtitle": "Найпотужніший інструмент, що допоможе тобі з GregTech, відкривається після твоєї першої подорожі на Місяць", "quests.ae2.certus_quartz.title": "Істинний кварц", "quests.ae2.certus_quartz.subtitle": "Маленький крок для тебе — гігантський стрибок для логістики", - "quests.ae2.certus_quartz.desc": "З першим кроком на Місяці ти отримуєш доступ до своєї першої жили &bІстинного кварцу&r.\nНе хвилюйся — вони досить поширені й мають бути легкими для пошуку, хоча хороший Розвідник руди точно не завадить.\n\nЧи вирішиш ти встановити шахтаря, чи викопати жилу вручну — обов’язково назбирай солідну кількість, адже вона знадобиться для прогресу в AE2.", + "quests.ae2.certus_quartz.desc": "З першим кроком на Місяці ти отримуєш доступ до своєї першої жили &bІстинного кварцу&r.\nНе хвилюйся — вони досить поширені й мають бути легкими для пошуку, хоча хороший Розвідник руди точно не завадить.\n\nЧи вирішиш ти встановити бур, чи викопати жилу вручну — обов’язково назбирай солідну кількість, адже вона знадобиться для прогресу в AE2.", "quests.ae2.certus_quartz.task": "Руда істинного кварцу", "quests.ae2.polarizer.title": "Намагнічувач", "quests.ae2.polarizer.subtitle": "Редстону недостатньо", @@ -1260,7 +1320,7 @@ "quests.gregtech_energy.lce_fuel.desc.2": "Щойно ви досягнете рівня &5EV&r і отримаєте доступ до &6Дистиляційної Вежі&r, настав час переходити на Бензин і Високооктановий Бензин. Не варто робити це надто рано — нафти слід правильно дистилювати, і робити це за допомогою звичайної Дистилерії зовсім неефективно.\n\nДля роботи цієї системи вам знадобиться поєднання дистиляції нафти та обробки органічних сполук. На щастя, Піролізна Піч і Дистиляційна Вежа справляються з цим напрочуд ефективно.\n\nЯкщо вам вдасться забезпечити стабільне постачання Високооктанового Бензину, то зможете пройти весь модпак, використовуючи лише Двигуни Внутрішнього Згоряння.", "quests.gregtech_energy.lce_fuel.task": "У мене достатньо", "quests.gregtech_energy.large_solar.subtitle": "Величезна проста енергія", - "quests.gregtech_energy.large_solar.desc.1": "Велика сонячна матриця MK I — це твоє основне рішення, якщо плануєш розгорнути більшу базу на Місяці.\n\nВона особливо корисна для &bобробних ліній AE2&r, а також здатна живити твої &bВидобувачі корінної породи&r.\n\nНе забудь, що ти можеш скористатися предметом &bТермінал GregTech&r, щоб миттєво побудувати мультиблок — просто затисни Shift і клацни ПКМ по контролері.\n\nПеревір рецепти, натиснувши &eU&r на контролері — там знайдеш усі доступні варіанти.", + "quests.gregtech_energy.large_solar.desc.1": "Велика сонячна матриця MK I — це твоє основне рішення, якщо плануєш розгорнути більшу базу на Місяці.\n\nВона особливо корисна для &bобробних ліній AE2&r, а також здатна живити твої &bГлибинні бури&r.\n\nНе забудь, що ти можеш скористатися предметом &bТермінал GregTech&r, щоб миттєво побудувати мультиблок — просто затисни Shift і клацни ПКМ по контролері.\n\nПеревір рецепти, натиснувши &eU&r на контролері — там знайдеш усі доступні варіанти.", "quests.gregtech_energy.large_solar.desc.2": "&6Велика сонячна матриця MK I&r має &92 різні рецепти&r:\n\n&9• Пасивний режим&r — \nУ цьому режимі не витрачаються жодні предмети, що робить його повністю пасивним. Проте він генерує лише &62A HV&r вдень — цього вистачить для базових систем, але далеко не оптимально.\n\n&9• Активний режим з обслуговуванням&r — \nЯкщо хочеш &aмаксимізувати енергетичний вихід&r, доведеться слідкувати за обслуговуванням. На початку кожного циклу існує &c5% шанс&r, що буде витрачено &dФотовольтаїчну капсулу&r.\n\n&eНаша рекомендація:&r \nНалаштуй пасивну логістичну лінію для постачання сонячної панелі фотовольтаїчними капсулами.\n\nЇх можна або транспортувати з &aЗемлі&r, або виготовляти безпосередньо на &7Місяці&r — вибір за тобою!", "quests.gregtech_energy.large_solar_t2.subtitle": "Ще потужніше", "quests.gregtech_energy.large_solar_t2.desc.1": "Якщо ти будуєш &dбазу AE2 на Місяці&r, тобі, швидше за все, знадобиться набагато більше енергії. І саме тут вступає в гру &6Велика сонячна матриця MK II&r!\n\nЯк і MK I, вона має 2 рецепти — але цього разу жоден із них не є повністю пасивним.", @@ -1462,7 +1522,7 @@ "quests.high_voltage.250_iq.desc.1": "Це гайд про те, як автоматично направити &lвсі&r твої Гарячі Злитки до &3Хімічної ванни&r, зберігаючи повну автоматизацію в ідеальному стані.\n\nДешевий варіант — використовувати фільтри та вручну додавати Гарячі Злитки по одному... але це ж так нудно! Давай краще оберемо веселий варіант.\n\nВстанови &aФільтр за тегом предмета&r на бік &3Хімічної ванни&r, відкрий його та встанови режим whitelist на -&e&l*hot_ingots*&r-.\n\nЗвідси ти можеш прокладати маршрути через &9будь-яку логістичну систему&r на свій вибір.", "quests.high_voltage.250_iq.desc.2": "Підключи вихід твого &3ЕДП(ів)&r до входу &3Хімічної ванни&r та до вихідного контейнера (Скрині або Ящика). Також можеш поставити &dОбмежувальну трубу&r перед контейнером, щоб забезпечити пріоритет для Хімічної ванни.\n\n&l&9Примітка:&r Якщо хочеш дізнатися більше тегів для автоматизації, вони відображаються при наведенні на предмет із затиснутим Shift. Наприклад, предмет із тегом &e&o#forge:plates/copper&r буде фільтруватися як &e&lplates/copper&r.\n\n&9&lІнша примітка:&r Фільтр за тегом предмета частково підтримує &dregex&r. Наведи курсор на іконку інформації, щоб дізнатися більше.", "quests.high_voltage.bedrock_miner.subtitle": "Необмежені руди?", - "quests.high_voltage.bedrock_miner.desc.1": "Це може бути твоє перше знайомство з &cРудним буром корінної породи&r, адже його рідко використовують у GregTech.\n\nВін працює подібно до &bРідинної бурової установки&r, але цільові жили &nніколи не виснажуються&r.\n\nВін майже не споживає енергії — чудово працює на &bMV&r або &6HV&r — і не потребує &aжодних вхідних матеріалів&r.\n\nТо в чому ж підступ? \nПотрібно знайти самі жили.", + "quests.high_voltage.bedrock_miner.desc.1": "Це може бути твоє перше знайомство з &cГлибинним буром&r, адже його рідко використовують у GregTech.\n\nВін працює подібно до &bРідинної Бурової Установки&r, але цільові жили &nніколи не виснажуються&r.\n\nВін майже не споживає енергії — чудово працює на &bMV&r або &6HV&r — і не потребує &aжодних вхідних матеріалів&r.\n\nТо в чому ж підступ? \nПотрібно знайти самі жили.", "quests.high_voltage.bedrock_miner.desc.2": "Тобі знадобиться &6HV&r Розвідник, налаштований на режим &oПошуку руд у корінній породі&r (&7Shift + ПКМ&r), а також трохи терпіння. Коли знайдеш потрібну жилу, доведеться ще й придумати, як доставити ресурси назад на свою базу.\n\nНа &fМісяці&r ти зможеш знайти свої перші рудні жили в корінній породі, що дозволить пасивно отримувати кілька важливих елементів абсолютно безкоштовно — назавжди. Перевір JEI, щоб побачити доступні варіанти! Чим вища &aВисота&r, тим частіше трапляється жила.\n\nОскільки вони будуть дуже розкидані, це чудова нагода побудувати &7місячний потяг&r!", "quests.high_voltage.space_alloy.title": "R-Алюміносталь", "quests.high_voltage.space_alloy.subtitle": "Ми це вигадали самі", @@ -1579,7 +1639,7 @@ "quests.low_voltage.machine_auto_output_behaviour.title": "Поведінка автоматичного виводу машини", "quests.low_voltage.machine_auto_output_behaviour.subtitle": "Давай навчатися.", "quests.low_voltage.machine_auto_output_behaviour.desc.1": "Усі машини зазвичай мають одну &7Лицьову Сторону&r та одну &9Вихідну Сторону&r. \n\n&7Лицьова Сторона&r повинна бути очевидною. \n&9Вихідна Сторона&r — це сторона з точкою або отвором. За замовчуванням вона розташована на задній частині машини при її встановленні. \n\nМашини можуть &aавтовивантажувати&r через свою вихідну сторону. \nЩоб увімкнути автовивантаження, натисни відповідну кнопку в GUI.\nАвтовивантаження рідин та предметів перемикаються окремо. \nДодатковий контроль над автовивантаженням можна здійснити за допомогою &dФільтрів&r та &dКришок&r, які описані в квесті у верхньому лівому куті цього.", - "quests.low_voltage.machine_auto_output_behaviour.desc.2": "Клацання правою кнопкою миші на машині з &5Гайковим ключем&r змінює вихідну сторону, а shift+клацання змінює лицьову сторону. Май на увазі, що лицьова сторона &cне може&r бути вихідною стороною! \n\nЗа замовчуванням предмети та рідини не можна вставляти через вихідну сторону, але це можна змінити за допомогою &5Викрутки&r. \nАбо клацни правою кнопкою миші безпосередньо на вихідній стороні, або shift+клацни на сітці, що відповідає стороні виходу. \n\nЄ унікальні машини, які не обробляють рецепти, такі як &3Насос&r, &3Шахтар&r, &3Рибалка&r, &3Колектор предметів&r тощо. Ці машини вивантажують предмети на свою &7Лицьову сторону&r (яка все ще позначена крапкою).", + "quests.low_voltage.machine_auto_output_behaviour.desc.2": "ПКМ на машині з &5Гайковим ключем&r змінює вихідну сторону, а shift+клацання змінює лицьову сторону. Май на увазі, що лицьова сторона &cне може&r бути вихідною стороною! \n\nЗа замовчуванням предмети та рідини не можна вставляти через вихідну сторону, але це можна змінити за допомогою &5Викрутки&r. \nАбо клацни правою кнопкою миші безпосередньо на вихідній стороні, або shift+клацни на сітці, що відповідає стороні виходу. \n\nЄ унікальні машини, які не обробляють рецепти, такі як &3Насос&r, &3Бур&r, &3Рибалка&r, &3Колектор предметів&r тощо. Ці машини вивантажують предмети на свою &7Лицьову сторону&r (яка все ще позначена крапкою).", "quests.low_voltage.machine_auto_output_behaviour.task": "Хм, як цікаво!", "quests.low_voltage.programmed_circuits.title": "Програмовані схеми", "quests.low_voltage.programmed_circuits.subtitle": "Не хочеш витрачати свої схеми на вибір рецептів?", @@ -1765,8 +1825,8 @@ "quests.medium_voltage.mv_miner.subtitle": "Так що вам набридло добувати самому?", "quests.medium_voltage.mv_miner.desc.1": "Ця добра душа&r буде добувати руди для тебе, якщо її розмістити над жилою. \n\nВертикальний діапазон необмежений під майнером. Горизонтальний діапазон відображається у підказці. \n\nВаріант &bMV&r може не мати достатнього діапазону для видобутку всієї жили, але варіант &6HV&r має, тому можливо варто зачекати. Отримай &eбудь-який&r, щоб завершити це завдання.", "quests.medium_voltage.mv_miner.desc.2": "Тобі знадобиться &9Енергія&r. &aЗаряджені Батареї&r можуть працювати, але вони мають властивість швидко розряджатися, що трохи незручно. \n\nНайкраща рекомендація — використовувати заповнену &3Бочку&r з якимось паливом &7(якщо ти використовуєш Пар, це не спрацює!)&r та &3Генератор&r. \n\nРозмісти Бочку над Генератором і клацни по ньому &5Викруткою&r, щоб автоматично передавати паливо в Генератор.", - "quests.medium_voltage.mv_miner.desc.3": "&cПримітка:&r Не забудь &dзавантажити чанки&r всіх 9 шматків рудної жили &7(відкрий карту, захопи чанки за допомогою Ctrl + ЛКМ і увімкни примусове завантаження після їх захоплення)&r. \n\n&9Порада:&r Ти можеш використовувати або &3ME Сундук&r, або &3GT Create&r як вихідний інвентар, щоб зробити транспортування руд додому простішим. &3ME Сундук&r можна живити безпосередньо від EU, але це буде доступно не відразу.", - "quests.medium_voltage.mv_miner.task": "Будь-який майнер", + "quests.medium_voltage.mv_miner.desc.3": "&cПримітка:&r Не забудь &dзавантажити чанки&r всіх 9 шматків рудної жили &7(відкрий карту, захопи чанки за допомогою Ctrl + ЛКМ і увімкни примусове завантаження після їх захоплення)&r. \n\n&9Порада:&r Ти можеш використовувати або &3ME Скриню&r, або &3GT Ящик&r як вихідний інвентар, щоб зробити транспортування руд додому простішим. &3ME Скриня&r можна живити безпосередньо від EU, але це буде доступно не відразу.", + "quests.medium_voltage.mv_miner.task": "Будь-який бур", "quests.medium_voltage.mv_component.title": "Компоненти MV", "quests.medium_voltage.mv_component_.subtitle": "Ненавидів створювати це на попередньому рівні?", "quests.medium_voltage.mv_component.desc": "Ось список компонентів, які тобі знадобляться в &bMV&r. Щоб зменшити складність, обов’язково налаштуй автокрафт або &dмасове виробництво&r цих деталей, особливо &aМоторів&r. \n\nЗнайомий з &aЕмітером&r? У цьому рівні Емітер вимагає &dБездоганний Смарагд&r у рецепті, який наразі можна отримати лише через &3Сортувальну Машину&r. \n\nКонвеєри, Помпи та Роботизовані Руки є об’єктивними покращеннями порівняно з версіями &7LV&r, якщо використовувати їх як накладки.", @@ -1820,14 +1880,14 @@ "quests.medium_voltage.mv_lpg.subtitle": "Хто перший відчув запах...", "quests.medium_voltage.mv_lpg.desc.1": "&aРафінований Газ&r, &aLPG&r та &aМетан&r — це &9Газові Палива&r. LPG (Зріджений Нафтогаз) — це суміш вуглеводнів, яка зазвичай використовується в опалювальних пристроях. \n\nРафінований Газ отримується або з &dПриродного Газу&r, або з &dЛегкої Нафти&r, причому останній варіант дає більший вихід, але вимагає додаткового етапу дистиляції. \n\nВикористання &3Центрифуги&r для розділення на &aLPG&r та &aМетан&r завжди варто проводити, оскільки це практично безкоштовно.", "quests.medium_voltage.mv_lpg.desc.2": "&a&aLPG&r та &aМетан&r спалюються в &3Газовій Турбіні&r. Серед інших варіантів палива вони найпростіші у налаштуванні, що робить їх чудовими для старту. \nЇхній недолік у тому, що їх не можна додатково очищати, тому оновлення &3Рідинної Бурової Установки&r може стати пріоритетом, якщо ти вирішиш використовувати цей тип палива. \n\n&aМетан&r також можна отримати з кількох &aприродних джерел&r. &eМіж нами&r, це меми, але ти можеш дослідити їх, якщо хочеш. Врешті-решт, вибір джерела енергії — твій.", - "quests.medium_voltage.mv_brewery.title": "Місцева Пивоварня, що продає Алкоголь", + "quests.medium_voltage.mv_brewery.title": "Місцева Броварня, що продає Алкоголь", "quests.medium_voltage.mv_brewery.subtitle": "*ік*... *ік*", - "quests.medium_voltage.mv_brewery.desc.1": "Пивоварню (Brewery) можна використовувати для виготовлення &aЗмазки&r з &aРедстоуна&r та &aКреозоту&r/&aНафти&r. Змазка має кілька вузьких застосувань — зокрема її можна використовувати в &3Різаку&r для значного скорочення часу виконання рецептів.\n\nПивоварня — надзвичайно повільна машина, але вона майже не потребує енергії для роботи. Побудова &2багатьох Пивоварень&r допоможе тобі отримати достатньо Біомаси для створення пластику.\n\n&9Примітка:&r Пивоварня відкриває шлях Біомаси до &9Етилену&r. Те ж саме можна здійснити в &3Піролізній Печі&r. Альтернативний шлях передбачає використання Нафти.&r", - "quests.medium_voltage.mv_brewery.desc.2": "&l&3Лор:&r&o Ти можеш створити власну Пивоварню, якщо хочеш заснувати компанію та почати продавати Алкоголь... у GregTech 6.&r", + "quests.medium_voltage.mv_brewery.desc.1": "Броварню можна використовувати для виготовлення &aЗмазки&r з &aРедстоуна&r та &aКреозоту&r/&aНафти&r. Змазка має кілька вузьких застосувань — зокрема її можна використовувати в &3Різаку&r для значного скорочення часу виконання рецептів.\n\nБроварня — надзвичайно повільна машина, але вона майже не потребує енергії для роботи. Побудова &2багатьох Броварень&r допоможе тобі отримати достатньо Біомаси для створення пластику.\n\n&9Примітка:&r Броварня відкриває шлях Біомаси до &9Етилену&r. Те ж саме можна здійснити в &3Піролізній Печі&r. Альтернативний шлях передбачає використання Нафти.&r", + "quests.medium_voltage.mv_brewery.desc.2": "&l&3Лор:&r&o Ти можеш створити власну Броварню, якщо хочеш заснувати компанію та почати продавати Алкоголь... у GregTech 6.&r", "quests.medium_voltage.mv_biomass.title": "Біомаса", "quests.medium_voltage.mv_biomass.subtitle": "Рослини недостатньо індустріальні!", - "quests.medium_voltage.mv_biomass.desc.1": "Ласкаво просимо на органічний шлях до &dЕтилену&r! Мета тут — отримати &dЕтанол&r і змішати його з &dСірчаною Кислотою&r, щоб створити &dЕтилен&r. \n\nЩоб отримати &dЕтанол&r, тобі потрібно переганяти його з &aБіомаси&r—тож давай розглянемо різні способи її виробництва. \n\nПерший метод простий: поклади &aсаджанці&r у &dПивоварню&r з водою. Недолік? &eЦе повільно&r.", - "quests.medium_voltage.mv_biomass.desc.2": "Другий метод складніший, але дає набагато кращі результати. Тобі потрібно отримати &aБіо-Шматки&r, які виходять при &aподрібненні Рослинних Куль&r. Зверни увагу, що ти не отримаєш &aдодатковий шанс&r, поки не розблокуєш &6HV Дроблення&r. \n\n&bРослинні Кулі&r можна отримати шляхом: \n- Центрифугування &9Цукрової Тростини&r або &9Буряка&r \n- Центрифугування будь-якої &aдеревини&r, яку можна добувати &9#afc:tappable_logs&r \n- Стискання &aсаджанців&r безпосередньо \n\nНарешті, оброби свої &aБіо-Шматки&r з водою в &dПивоварні&r або скористайся &dПіролізною Піччю&r для &e66 відсотків збільшення&r виходу.", + "quests.medium_voltage.mv_biomass.desc.1": "Ласкаво просимо на органічний шлях до &dЕтилену&r! Мета тут — отримати &dЕтанол&r і змішати його з &dСірчаною Кислотою&r, щоб створити &dЕтилен&r. \n\nЩоб отримати &dЕтанол&r, тобі потрібно переганяти його з &aБіомаси&r—тож давай розглянемо різні способи її виробництва. \n\nПерший метод простий: поклади &aсаджанці&r у &dБроварню&r з водою. Недолік? &eЦе повільно&r.", + "quests.medium_voltage.mv_biomass.desc.2": "Другий метод складніший, але дає набагато кращі результати. Тобі потрібно отримати &aБіо-Шматки&r, які виходять при &aподрібненні Рослинних Культур&r. Зверни увагу, що ти не отримаєш &aдодатковий шанс&r, поки не розблокуєш &6HV Дроблення&r. \n\n&bРослинні Кулі&r можна отримати шляхом: \n- Центрифугування &9Цукрової Тростини&r або &9Буряка&r \n- Центрифугування будь-якої &aдеревини&r, яку можна добувати &9#afc:tappable_logs&r \n- Стискання &aсаджанців&r безпосередньо \n\nНарешті, оброби свої &aБіо-Шматки&r з водою в &dБроварні&r або скористайся &dПіролізною Піччю&r для &e66 відсотків збільшення&r виходу.", "quests.medium_voltage.mv_biomass.desc.3": "&l&3Лор:&r&o Ти можеш впізнати Рослинні Кулі з IndustrialCraft2! У IC2 Experimental був досить... незрозумілий спосіб перетворення Біомаси на Біогаз для енергії, який, на жаль, вимагав надто великих інвестицій, щоб бути справді вигідним.", "quests.medium_voltage.mv_distillery.title": "Дистилярня", "quests.medium_voltage.mv_distillery.subtitle": "Ілюзія Вільного Вибору", @@ -1971,7 +2031,7 @@ "quests.medium_voltage.mv_cutter.title": "Розширений Різак", "quests.medium_voltage.mv_cutter.subtitle": "Оновлення, люди, оновлення!", "quests.medium_voltage.mv_cutter.desc": "&3MV Різак&r необхідний для нарізання &7Силіконових Буль&r, щоб підготувати їх до &aЛазерного Гравіювання&r. \n\nРекомендуємо забезпечити цю машину стабільним потоком &dМастила&r, щоб скоротити час обробки. \n\nМастило можна &3зварити&r з &eНафти&r та &aТальку&r, &2Стеатиту&r або &cРедстоуну&r. \n\n&7Примітка: Ти можеш використовувати &6Велику&r &7версію, вона тепер має бак для заповнення рідиною&r&r", - "quests.medium_voltage.mv_cutter.task": "Будь-яка пивоварня", + "quests.medium_voltage.mv_cutter.task": "Будь-яка Броварня", "quests.medium_voltage.mv_laser_engraver.title": "Лазерне Гравіювання", "quests.medium_voltage.mv_laser_engraver.subtitle": "Це вершина технологій, але це також повільно", "quests.medium_voltage.mv_laser_engraver.desc": "&3Лазерний Гравер&r наносить візерунки на &9Силіконові Вафлі&r залежно від типу &9Лінзи&r, яку він отримує. Після гравіювання вафлі потрібно пропустити через &3Різальну Машину&r, щоб перетворити їх на компоненти, готові до використання в Схемах. \n\nГравери вищого рівня можуть гравіювати складніші вафлі для більш ефективних Схем.", @@ -2256,7 +2316,7 @@ "quests.space_survival.flag.task": "Будь-який прапор", "quests.space_survival.chorus.title": "Фрукт хоруса", "quests.space_survival.chorus.subtitle": "Це кінець?", - "quests.space_survival.chorus.desc": "&5Плід Хорусу&r відіграє доволі важливу роль на Місяці — це буде твоє головне джерело азоту. Щоб розпочати, знайди рослини хорусу, застрибуй на верхівку та зривай &5Квіти хорусу&r. Якщо зламати рослину знизу — квітів не отримаєш! Далі вирощуй квіти хорусу в електричній теплиці, щоб отримати поновлюване джерело плодів хорусу. З них можна виготовити біомасу та азот за допомогою пивоварні та ферментера відповідно. Біомасу також можна переганяти в вуглець — для додаткового ракетного пального!", + "quests.space_survival.chorus.desc": "&5Плід Хорусу&r відіграє доволі важливу роль на Місяці — це буде твоє основне джерело Азоту. Щоб почати, знайди рослини хорусу, застрибуй на верхівку та зламай &5Квіти хорусу&r. Ламаючи рослину знизу, ти не отримаєш жодної квітки! Далі вирощуй квіти хорусу в Електричній теплиці, щоб отримати поновлюване джерело плодів хорусу, а вже з них можна виготовити Біомасу та Азот за допомогою Броварні та Ферментатора відповідно. Біомасу також можна переганяти в Вуглець для додаткового ракетного пального!", "quests.space_survival.rover.title": "Космічний Ровер", "quests.space_survival.rover.subtitle": "Твій транспорт для втечі", "quests.space_survival.rover.desc": "Довелося залишити модний реактивний ранець вдома: атмосфери для літаків тут нема, коні не витримують — тож як пересуватись? &bРовер&r — твій вірний транспорт! Він вміщує до двох пасажирів, працює на горючих паливних сумішах (дизель, бензин і ракетне паливо), а ще має власний інвентар і радіо, що відтворює реальні радіостанції!", @@ -2534,7 +2594,7 @@ "quests.steam_age.miner.title": "Автоматичне Видобування", "quests.steam_age.miner.subtitle": "Кінець епохи обвалів", "quests.steam_age.miner.desc.1": "Тепер у вас є доступ до двох варіантів автоматичного видобування руди! Обидва варіанти досить повільні, тому краще налаштувати їх, завантажити чанки і зайнятися чимось іншим, ніж сидіти і чекати.\n\nМеханічний Бур потребуватиме конструкції для буріння вниз, розбиваючи весь камінь на своєму шляху. Ви також можете прикріпити його до передньої частини поїзда або вагонетки для створення тунелів, якщо хочете.", - "quests.steam_age.miner.desc.2": "Парова Шахтарка, з іншого боку, видобуває лише рудні блоки й замінює їх бруківкою, залишаючи решту ґрунту недоторканою. Вона може видобувати руду в (малому) радіусі, що означає, що її потрібно переміщати рідше, ніж механічну шахтарку, але вона також набагато повільніша.", + "quests.steam_age.miner.desc.2": "Паровий Бур, з іншого боку, видобуває лише рудні блоки й замінює їх бруківкою, залишаючи решту ґрунту недоторканою. Вона може видобувати руду в (малому) радіусі, що означає, що її потрібно переміщати рідше, ніж механічну шахтарку, але вона також набагато повільніша.", "quests.steam_age.paper.title": "Папір", "quests.steam_age.paper.subtitle": "Не з цукрової тростини", "quests.steam_age.paper.desc": "Якщо ви ще не зробили жодного паперу, є три різні способи отримати його без електрики:\n\n1) Створити пергамент зі шкіри, пемзи та яйця.\n\n2) Сплести разом папірус.\n\n3) Виготовити папір із твердої деревини через тривалий процес.\n\nПізніше ви зможете перетворювати деревну масу безпосередньо в папір за допомогою LV Хімічної Ванни.", From 7e62c260d26eab6e51cc2a81fc0a67cc0a677a19 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:00:09 +0100 Subject: [PATCH 32/52] emi categories --- .../assets/emi/category/properties/ad_astra_oxygen_loading.json | 2 +- kubejs/assets/emi/category/properties/ae2_attunement.json | 2 +- kubejs/assets/emi/category/properties/ae2_condenser.json | 2 +- .../assets/emi/category/properties/ae2_item_transformation.json | 2 +- kubejs/assets/emi/category/properties/create_draining.json | 2 +- kubejs/assets/emi/category/properties/create_spout_filling.json | 2 +- .../category/properties/domum_ornamentum_architects_cutter.json | 2 +- kubejs/assets/emi/category/properties/emi_info.json | 2 +- kubejs/assets/emi/category/properties/emi_tag.json | 2 +- .../emi/category/properties/exposure_photograph_printing.json | 2 +- .../emi/category/properties/exposure_photograph_stacking.json | 2 +- .../emi/category/properties/framedblocks_framing_saw.json | 2 +- .../emi/category/properties/greate_automatic_packing.json | 2 +- .../assets/emi/category/properties/greate_automatic_shaped.json | 2 +- .../emi/category/properties/greate_automatic_shapeless.json | 2 +- kubejs/assets/emi/category/properties/greate_block_cutting.json | 2 +- kubejs/assets/emi/category/properties/greate_fan_washing.json | 2 +- kubejs/assets/emi/category/properties/greate_mixing.json | 2 +- .../emi/category/properties/gtceu_arc_furnace_recycling.json | 2 +- kubejs/assets/emi/category/properties/gtceu_chem_dyes.json | 2 +- .../emi/category/properties/gtceu_extractor_recycling.json | 2 +- .../properties/gtceu_extraterrestrial_ore_fabricator.json | 1 + .../assets/emi/category/properties/gtceu_fission_reactor.json | 2 +- kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json | 2 +- kubejs/assets/emi/category/properties/gtceu_greenhouse.json | 2 +- kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json | 2 +- .../emi/category/properties/gtceu_implosion_compressor.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ingot_molding.json | 2 +- .../emi/category/properties/gtceu_macerator_recycling.json | 2 +- kubejs/assets/emi/category/properties/gtceu_mixer.json | 2 +- .../emi/category/properties/gtceu_moon_dust_harvester.json | 1 + kubejs/assets/emi/category/properties/gtceu_nether_dome.json | 2 +- .../emi/category/properties/gtceu_nuclear_fuel_factory.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ore_bathing.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ore_crushing.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ore_forging.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ore_washer.json | 2 +- .../assets/emi/category/properties/gtceu_ostrum_harvester.json | 1 + .../emi/category/properties/gtceu_programmed_circuit.json | 2 +- kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json | 2 +- .../assets/emi/category/properties/gtceu_research_station.json | 2 +- kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json | 2 +- kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json | 2 +- kubejs/assets/emi/category/properties/gtceu_wire_coating.json | 2 +- kubejs/assets/emi/category/properties/minecraft_smithing.json | 2 +- .../assets/emi/category/properties/minecraft_stonecutting.json | 2 +- .../assets/emi/category/properties/tacz_attachment_query.json | 2 +- .../emi/category/properties/taczammoquery_ammo_query.json | 2 +- 48 files changed, 48 insertions(+), 45 deletions(-) create mode 100644 kubejs/assets/emi/category/properties/gtceu_extraterrestrial_ore_fabricator.json create mode 100644 kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json create mode 100644 kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json diff --git a/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json b/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json index 15e23522e..02998692d 100644 --- a/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json +++ b/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json @@ -1 +1 @@ -{"ad_astra:oxygen_loading":{"order":160}} \ No newline at end of file +{"ad_astra:oxygen_loading":{"order":163}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_attunement.json b/kubejs/assets/emi/category/properties/ae2_attunement.json index 21e600843..050ef7764 100644 --- a/kubejs/assets/emi/category/properties/ae2_attunement.json +++ b/kubejs/assets/emi/category/properties/ae2_attunement.json @@ -1 +1 @@ -{"ae2:attunement":{"order":157}} \ No newline at end of file +{"ae2:attunement":{"order":160}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_condenser.json b/kubejs/assets/emi/category/properties/ae2_condenser.json index 736352e76..f621d7885 100644 --- a/kubejs/assets/emi/category/properties/ae2_condenser.json +++ b/kubejs/assets/emi/category/properties/ae2_condenser.json @@ -1 +1 @@ -{"ae2:condenser":{"order":147}} \ No newline at end of file +{"ae2:condenser":{"order":150}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_item_transformation.json b/kubejs/assets/emi/category/properties/ae2_item_transformation.json index 4e667603b..21e60570d 100644 --- a/kubejs/assets/emi/category/properties/ae2_item_transformation.json +++ b/kubejs/assets/emi/category/properties/ae2_item_transformation.json @@ -1 +1 @@ -{"ae2:item_transformation":{"order":136}} \ No newline at end of file +{"ae2:item_transformation":{"order":139}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_draining.json b/kubejs/assets/emi/category/properties/create_draining.json index a0e741d6d..c34ca498f 100644 --- a/kubejs/assets/emi/category/properties/create_draining.json +++ b/kubejs/assets/emi/category/properties/create_draining.json @@ -1 +1 @@ -{"create:draining":{"order":158}} \ No newline at end of file +{"create:draining":{"order":161}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_spout_filling.json b/kubejs/assets/emi/category/properties/create_spout_filling.json index a1cccfa25..901f701ea 100644 --- a/kubejs/assets/emi/category/properties/create_spout_filling.json +++ b/kubejs/assets/emi/category/properties/create_spout_filling.json @@ -1 +1 @@ -{"create:spout_filling":{"order":159}} \ No newline at end of file +{"create:spout_filling":{"order":162}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json index 4fab80a17..b61473953 100644 --- a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json +++ b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json @@ -1 +1 @@ -{"domum_ornamentum:architects_cutter":{"order":156}} \ No newline at end of file +{"domum_ornamentum:architects_cutter":{"order":159}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_info.json b/kubejs/assets/emi/category/properties/emi_info.json index 581ade081..807e42a56 100644 --- a/kubejs/assets/emi/category/properties/emi_info.json +++ b/kubejs/assets/emi/category/properties/emi_info.json @@ -1 +1 @@ -{"emi:info":{"order":165}} \ No newline at end of file +{"emi:info":{"order":168}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_tag.json b/kubejs/assets/emi/category/properties/emi_tag.json index 79f42778b..aa6ef6c12 100644 --- a/kubejs/assets/emi/category/properties/emi_tag.json +++ b/kubejs/assets/emi/category/properties/emi_tag.json @@ -1 +1 @@ -{"emi:tag":{"order":166}} \ No newline at end of file +{"emi:tag":{"order":169}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json index ed769e4c3..fbd77aa93 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json @@ -1 +1 @@ -{"exposure:photograph_printing":{"order":152}} \ No newline at end of file +{"exposure:photograph_printing":{"order":155}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json index 7df080a00..c79168c91 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json @@ -1 +1 @@ -{"exposure:photograph_stacking":{"order":161}} \ No newline at end of file +{"exposure:photograph_stacking":{"order":164}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json index 4b41fbf76..267616879 100644 --- a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json +++ b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json @@ -1 +1 @@ -{"framedblocks:framing_saw":{"order":155}} \ No newline at end of file +{"framedblocks:framing_saw":{"order":158}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_packing.json b/kubejs/assets/emi/category/properties/greate_automatic_packing.json index 1f21a3a8c..6b61d6b7d 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_packing.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_packing.json @@ -1 +1 @@ -{"greate:automatic_packing":{"order":150}} \ No newline at end of file +{"greate:automatic_packing":{"order":153}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json index e10ee67f4..c2210ef99 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json @@ -1 +1 @@ -{"greate:automatic_shaped":{"order":148}} \ No newline at end of file +{"greate:automatic_shaped":{"order":151}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json index ea5261e22..b50321f15 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json @@ -1 +1 @@ -{"greate:automatic_shapeless":{"order":149}} \ No newline at end of file +{"greate:automatic_shapeless":{"order":152}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_block_cutting.json b/kubejs/assets/emi/category/properties/greate_block_cutting.json index 7c5cabc74..d17682c3f 100644 --- a/kubejs/assets/emi/category/properties/greate_block_cutting.json +++ b/kubejs/assets/emi/category/properties/greate_block_cutting.json @@ -1 +1 @@ -{"greate:block_cutting":{"order":154}} \ No newline at end of file +{"greate:block_cutting":{"order":157}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_fan_washing.json b/kubejs/assets/emi/category/properties/greate_fan_washing.json index 08976ed67..fa1e45dbb 100644 --- a/kubejs/assets/emi/category/properties/greate_fan_washing.json +++ b/kubejs/assets/emi/category/properties/greate_fan_washing.json @@ -1 +1 @@ -{"greate:fan_washing":{"order":138}} \ No newline at end of file +{"greate:fan_washing":{"order":141}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_mixing.json b/kubejs/assets/emi/category/properties/greate_mixing.json index ec06a9243..24217c56d 100644 --- a/kubejs/assets/emi/category/properties/greate_mixing.json +++ b/kubejs/assets/emi/category/properties/greate_mixing.json @@ -1 +1 @@ -{"greate:mixing":{"order":107}} \ No newline at end of file +{"greate:mixing":{"order":108}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json index 0fcc05a0e..eed81b2af 100644 --- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json @@ -1 +1 @@ -{"gtceu:arc_furnace_recycling":{"order":144}} \ No newline at end of file +{"gtceu:arc_furnace_recycling":{"order":147}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json index f60b884be..f592dd78d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json +++ b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json @@ -1 +1 @@ -{"gtceu:chem_dyes":{"order":142}} \ No newline at end of file +{"gtceu:chem_dyes":{"order":145}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json index af7be0640..15e4ca157 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json @@ -1 +1 @@ -{"gtceu:extractor_recycling":{"order":146}} \ No newline at end of file +{"gtceu:extractor_recycling":{"order":149}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extraterrestrial_ore_fabricator.json b/kubejs/assets/emi/category/properties/gtceu_extraterrestrial_ore_fabricator.json new file mode 100644 index 000000000..acae1097c --- /dev/null +++ b/kubejs/assets/emi/category/properties/gtceu_extraterrestrial_ore_fabricator.json @@ -0,0 +1 @@ +{"gtceu:extraterrestrial_ore_fabricator":{"order":124}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json index b48cdf010..ac604f3da 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json @@ -1 +1 @@ -{"gtceu:fission_reactor":{"order":124}} \ No newline at end of file +{"gtceu:fission_reactor":{"order":125}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json index f23e5f636..625f152b9 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json @@ -1 +1 @@ -{"gtceu:fusion_reactor":{"order":125}} \ No newline at end of file +{"gtceu:fusion_reactor":{"order":126}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json index eedcb8176..1361a60ec 100644 --- a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json +++ b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json @@ -1 +1 @@ -{"gtceu:greenhouse":{"order":126}} \ No newline at end of file +{"gtceu:greenhouse":{"order":127}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json b/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json index a11f78a23..93287f083 100644 --- a/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json +++ b/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json @@ -1 +1 @@ -{"gtceu:heat_exchanger":{"order":127}} \ No newline at end of file +{"gtceu:heat_exchanger":{"order":128}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json index 1615ed1e7..c7c455065 100644 --- a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json @@ -1 +1 @@ -{"gtceu:implosion_compressor":{"order":128}} \ No newline at end of file +{"gtceu:implosion_compressor":{"order":129}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json index 1507b6c44..691d3f64b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json +++ b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json @@ -1 +1 @@ -{"gtceu:ingot_molding":{"order":143}} \ No newline at end of file +{"gtceu:ingot_molding":{"order":146}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json index 58eb061dd..47e261972 100644 --- a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json @@ -1 +1 @@ -{"gtceu:macerator_recycling":{"order":145}} \ No newline at end of file +{"gtceu:macerator_recycling":{"order":148}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_mixer.json b/kubejs/assets/emi/category/properties/gtceu_mixer.json index eea125b10..772935fd5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_mixer.json +++ b/kubejs/assets/emi/category/properties/gtceu_mixer.json @@ -1 +1 @@ -{"gtceu:mixer":{"order":108}} \ No newline at end of file +{"gtceu:mixer":{"order":107}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json b/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json new file mode 100644 index 000000000..803200e6f --- /dev/null +++ b/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json @@ -0,0 +1 @@ +{"gtceu:moon_dust_harvester":{"order":133}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nether_dome.json b/kubejs/assets/emi/category/properties/gtceu_nether_dome.json index 302667d16..1ea8384f5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nether_dome.json +++ b/kubejs/assets/emi/category/properties/gtceu_nether_dome.json @@ -1 +1 @@ -{"gtceu:nether_dome":{"order":129}} \ No newline at end of file +{"gtceu:nether_dome":{"order":130}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json b/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json index f51f17a44..53a66941c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json +++ b/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json @@ -1 +1 @@ -{"gtceu:nuclear_fuel_factory":{"order":130}} \ No newline at end of file +{"gtceu:nuclear_fuel_factory":{"order":131}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json index 71f32433f..7f72fd197 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json @@ -1 +1 @@ -{"gtceu:ore_bathing":{"order":141}} \ No newline at end of file +{"gtceu:ore_bathing":{"order":144}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json index 0c76b9cc0..b05b57f76 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json @@ -1 +1 @@ -{"gtceu:ore_crushing":{"order":139}} \ No newline at end of file +{"gtceu:ore_crushing":{"order":142}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json index ff4791683..dc6d9e3ac 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json @@ -1 +1 @@ -{"gtceu:ore_forging":{"order":140}} \ No newline at end of file +{"gtceu:ore_forging":{"order":143}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json index 58e9e2f86..7b7d0a331 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json @@ -1 +1 @@ -{"gtceu:ore_washer":{"order":137}} \ No newline at end of file +{"gtceu:ore_washer":{"order":140}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json b/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json new file mode 100644 index 000000000..0e164cd61 --- /dev/null +++ b/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json @@ -0,0 +1 @@ +{"gtceu:ostrum_harvester":{"order":132}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json index 5bd06eb69..4bdba8aed 100644 --- a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json +++ b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json @@ -1 +1 @@ -{"gtceu:programmed_circuit":{"order":164}} \ No newline at end of file +{"gtceu:programmed_circuit":{"order":167}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json index 24e980282..5fef26d48 100644 --- a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json @@ -1 +1 @@ -{"gtceu:pyrolyse_oven":{"order":131}} \ No newline at end of file +{"gtceu:pyrolyse_oven":{"order":134}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_research_station.json b/kubejs/assets/emi/category/properties/gtceu_research_station.json index 561d3ff09..0421b74de 100644 --- a/kubejs/assets/emi/category/properties/gtceu_research_station.json +++ b/kubejs/assets/emi/category/properties/gtceu_research_station.json @@ -1 +1 @@ -{"gtceu:research_station":{"order":132}} \ No newline at end of file +{"gtceu:research_station":{"order":135}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json index 6a96027e1..e0f7f088f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json @@ -1 +1 @@ -{"gtceu:steam_bloomery":{"order":133}} \ No newline at end of file +{"gtceu:steam_bloomery":{"order":136}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json index c8c311d3a..7de68c9e7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json +++ b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json @@ -1 +1 @@ -{"gtceu:vacuum_freezer":{"order":134}} \ No newline at end of file +{"gtceu:vacuum_freezer":{"order":137}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json index babcc7fae..0a8a44291 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json +++ b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json @@ -1 +1 @@ -{"gtceu:wire_coating":{"order":135}} \ No newline at end of file +{"gtceu:wire_coating":{"order":138}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_smithing.json b/kubejs/assets/emi/category/properties/minecraft_smithing.json index a8dfa8cba..2555ee200 100644 --- a/kubejs/assets/emi/category/properties/minecraft_smithing.json +++ b/kubejs/assets/emi/category/properties/minecraft_smithing.json @@ -1 +1 @@ -{"minecraft:smithing":{"order":151}} \ No newline at end of file +{"minecraft:smithing":{"order":154}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json index 505522bdf..503fa0f66 100644 --- a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json +++ b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json @@ -1 +1 @@ -{"minecraft:stonecutting":{"order":153}} \ No newline at end of file +{"minecraft:stonecutting":{"order":156}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tacz_attachment_query.json b/kubejs/assets/emi/category/properties/tacz_attachment_query.json index 88a63eec8..c6e0a8465 100644 --- a/kubejs/assets/emi/category/properties/tacz_attachment_query.json +++ b/kubejs/assets/emi/category/properties/tacz_attachment_query.json @@ -1 +1 @@ -{"tacz:attachment_query":{"order":162}} \ No newline at end of file +{"tacz:attachment_query":{"order":165}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json b/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json index 6afdd44f3..b41343d9b 100644 --- a/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json +++ b/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json @@ -1 +1 @@ -{"taczammoquery:ammo_query":{"order":163}} \ No newline at end of file +{"taczammoquery:ammo_query":{"order":166}} \ No newline at end of file From 6a06eb815c6c0b2518313e73ed134b9e872f9eec Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:26:56 +0100 Subject: [PATCH 33/52] a few new ore veins --- CHANGELOG.md | 2 + .../entries/tfg_ores/earth_ore_index.json | 6 +- .../entries/tfg_ores/earth_vein_index.json | 98 +++- .../entries/tfg_ores/mars_ore_index.json | 22 + .../entries/tfg_ores/mars_vein_index.json | 49 ++ .../entries/tfg_ores/moon_ore_index.json | 15 +- .../entries/tfg_ores/moon_vein_index.json | 485 +++++++++++++++++- .../entries/tfg_ores/nether_ore_index.json | 16 +- .../entries/tfg_ores/nether_vein_index.json | 96 +++- .../entries/tfg_ores/earth_ore_index.json | 6 +- .../entries/tfg_ores/earth_vein_index.json | 98 +++- .../entries/tfg_ores/mars_ore_index.json | 22 + .../entries/tfg_ores/mars_vein_index.json | 49 ++ .../entries/tfg_ores/moon_ore_index.json | 15 +- .../entries/tfg_ores/moon_vein_index.json | 485 +++++++++++++++++- .../entries/tfg_ores/nether_ore_index.json | 14 +- .../entries/tfg_ores/nether_vein_index.json | 96 +++- .../entries/tfg_ores/earth_ore_index.json | 8 +- .../entries/tfg_ores/earth_vein_index.json | 100 +++- .../entries/tfg_ores/mars_ore_index.json | 22 + .../entries/tfg_ores/mars_vein_index.json | 49 ++ .../entries/tfg_ores/moon_ore_index.json | 15 +- .../entries/tfg_ores/moon_vein_index.json | 485 +++++++++++++++++- .../entries/tfg_ores/nether_ore_index.json | 16 +- .../entries/tfg_ores/nether_vein_index.json | 98 +++- .../entries/tfg_ores/earth_ore_index.json | 6 +- .../entries/tfg_ores/earth_vein_index.json | 100 +++- .../entries/tfg_ores/mars_ore_index.json | 22 + .../entries/tfg_ores/mars_vein_index.json | 49 ++ .../entries/tfg_ores/moon_ore_index.json | 15 +- .../entries/tfg_ores/moon_vein_index.json | 485 +++++++++++++++++- .../entries/tfg_ores/nether_ore_index.json | 16 +- .../entries/tfg_ores/nether_vein_index.json | 98 +++- kubejs/assets/tfg/lang/en_us.json | 8 + kubejs/assets/tfg/lang/pt_br.json | 8 + kubejs/assets/tfg/lang/ru_ru.json | 8 + kubejs/assets/tfg/lang/uk_ua.json | 40 +- .../earth/vein/deep_garnet_opal.json | 4 +- .../earth/vein/deep_gold.json | 4 +- .../earth/vein/deep_hematite.json | 4 +- .../earth/vein/deep_molybdenum.json | 4 +- .../earth/vein/deep_sapphire.json | 4 +- .../earth/vein/normal_basaltic_sands.json | 4 +- .../earth/vein/normal_beryllium.json | 4 +- .../earth/vein/normal_copper.json | 4 +- .../earth/vein/normal_garnet_tin.json | 4 +- .../earth/vein/normal_gold.json | 4 +- .../earth/vein/normal_graphite.json | 4 +- .../earth/vein/normal_gypsum.json | 200 ++++++++ .../earth/vein/normal_hematite.json | 4 +- .../earth/vein/normal_manganese.json | 4 +- .../earth/vein/normal_olivine.json | 4 +- .../earth/vein/normal_sphalerite.json | 4 +- .../earth/vein/normal_sulfur.json | 4 +- .../earth/vein/surface_copper.json | 4 +- .../earth/vein/surface_sphalerite.json | 4 +- .../mars/vein/mars_hematite.json | 252 +++++++++ .../moon/vein/moon_bauxite.json | 52 +- .../moon/vein/moon_beryllium.json | 4 +- .../moon/vein/moon_cassiterite.json | 158 ++++++ .../moon/vein/moon_desh.json | 4 +- .../moon/vein/moon_garnet.json | 133 +++++ .../moon/vein/moon_gold.json | 121 +++++ .../moon/vein/moon_graphite.json | 8 +- .../moon/vein/moon_gypsum.json | 136 +++++ .../moon/vein/moon_lubricant.json | 4 +- .../moon/vein/moon_manganese.json | 8 +- .../moon/vein/moon_mica.json | 10 +- .../moon/vein/moon_molybdenum.json | 4 +- .../moon/vein/moon_pyrolusite.json | 4 +- .../moon/vein/moon_quartz.json | 4 +- .../moon/vein/moon_sapphire.json | 4 +- .../moon/vein/moon_sheldonite.json | 4 +- .../moon/vein/moon_sphalerite.json | 4 +- .../moon/vein/moon_tetrahedrite.json | 146 ++++++ .../moon/vein/moon_topaz.json | 4 +- .../nether/vein/nether_basaltic_sands.json | 4 +- .../nether/vein/nether_beryllium.json | 4 +- .../nether/vein/nether_copper.json | 4 +- .../nether/vein/nether_garnet.json | 4 +- .../nether/vein/nether_goethite.json | 4 +- .../nether/vein/nether_gypsum.json | 151 ++++++ .../nether/vein/nether_hematite.json | 4 +- .../nether/vein/nether_magnetite.json | 4 +- .../nether/vein/nether_manganese.json | 4 +- .../nether/vein/nether_naquadah.json | 4 +- .../nether/vein/nether_olivine.json | 4 +- .../nether/vein/nether_quartz.json | 4 +- .../nether/vein/nether_sheldonite.json | 4 +- .../nether/vein/nether_sphalerite.json | 4 +- .../nether/vein/nether_sulfur.json | 4 +- .../nether/vein/nether_topaz.json | 4 +- .../earth/vein/normal_gypsum.json | 5 + .../mars/vein/mars_hematite.json | 5 + .../moon/vein/moon_cassiterite.json | 5 + .../placed_feature/moon/vein/moon_garnet.json | 5 + .../placed_feature/moon/vein/moon_gold.json | 5 + .../placed_feature/moon/vein/moon_gypsum.json | 5 + .../moon/vein/moon_tetrahedrite.json | 5 + .../nether/vein/nether_gypsum.json | 5 + kubejs/server_scripts/tfg/tags.veins.js | 14 + 101 files changed, 4598 insertions(+), 225 deletions(-) create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_cassiterite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_garnet.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gold.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_tetrahedrite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_hematite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_cassiterite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_garnet.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gold.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_tetrahedrite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/nether/vein/nether_gypsum.json diff --git a/CHANGELOG.md b/CHANGELOG.md index a625b18e9..cd8841714 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ - Adjusted recipes for ME Interface and Pattern Provider for consistency (#1569) @TomPlop - Changed the cost of the ME Quantum Tunnel (#1569) @TomPlop - Alabaster is now renewable via rock breaker @gustovafing +- Added a new ore vein to all dimensions for gypsum, calcite, borax, and fuller's earth @Pyritie +- Added some more moon ore veins for copper, tin, gold, aluminium.. nothing exciting @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json index 4418b7c6f..a548ee3b6 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandine: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Alunite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Apatite: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Asbestos: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Barite: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Basaltic Mineral Sands: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Bauxite: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Bentonite: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Beryllium: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Bismuth: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Borax: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", + "text": "$(li)Almandine: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Alunite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Apatite: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Asbestos: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Barite: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Basaltic Mineral Sands: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Bauxite: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Bentonite: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Beryllium: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Bismuth: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Borax: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Bornite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/earth_vein_index#deep_magnetite)33%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)4%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cobalt: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Cooperite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)Diamond: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Diatomite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()", + "text": "$(li)Bornite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/earth_vein_index#deep_magnetite)33%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)4%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cobalt: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Cooperite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)Diamond: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Diatomite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Electrotine: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()$(li)Emerald: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)Fuller's Earth: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Galena: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Garnet Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Garnierite: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Goethite: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Granitic Mineral Sand: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Hematite: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()", + "text": "$(li)Electrotine: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()$(li)Emerald: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)Fuller's Earth: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)Galena: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Garnet Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Garnierite: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Goethite: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Granitic Mineral Sand: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Hematite: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json index cf867747d..6d90ccabf 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json @@ -19,17 +19,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -1587,6 +1587,98 @@ "text": "$(thing)Percentage$(): 25%$(br)$(thing)Used for$(): Macerators, AE2$(br)$(thing)Formula$(): C", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Size$(): 40$(br)$(thing)Height$(): 9$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale", + "title": "Gypsum & Calcite", + "type": "patchouli:text", + "anchor": "normal_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gypsum", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Used for$(): Alabaster (dyeable) bricks$(br)$(thing)Formula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcite", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 30%$(br)$(thing)Source of$(): Calcium$(br)$(thing)Formula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Borax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Sodium, Boron$(br)$(thing)Formula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Fuller's Earth", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Magnesium$(br)$(thing)Formula$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 75$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json new file mode 100644 index 000000000..39be0fa88 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json @@ -0,0 +1,22 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Ore Index", + "icon": "tfc:ore/normal_hematite", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "This is the $(thing)Ore Index$() for $(thing)Mars$(). All ores are sorted alphabetically and then by richest to poorest vein type. You can click on them to learn more information about each vein.", + "title": "Mars Ore Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Hematite: $(l:tfg_ores/mars_vein_index#mars_hematite)100%$(/l)$()", + "type": "patchouli:text" + } + ], + "sortnum": 6 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json new file mode 100644 index 000000000..ff302ed25 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json @@ -0,0 +1,49 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Vein Index", + "icon": "gtceu:mars_stone_hematite_ore", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "This is the $(thing)Vein Index$() for $(item)Mars$(). Each Vein has details regarding its rarity, density, vein type, height found, sizes, what stones it spawns in, and more.", + "title": "Mars Vein Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)(Placeholder Vein)$()$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -16 — 100$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "title": "(Placeholder Vein)", + "type": "patchouli:text", + "anchor": "mars_hematite" + }, + { + "Type": "patchouli:multiblock", + "name": "Hematite", + "multiblock": { + "mapping": { + "0": "#forge:ores/hematite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 100%$(br)$(thing)Melts into$(): Cast Iron$(br)$(thing)Formula$(): Fe₂O₃", + "type": "patchouli:multiblock" + } + ], + "sortnum": 7 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json index 1f8346dd5..456d3bb57 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json @@ -14,27 +14,32 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandine: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Aluminium: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Apatite: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barite: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Bauxite: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Beryllium: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Bornite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Certus Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Chromite: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()", + "text": "$(li)Almandine: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Aluminium: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Alunite: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Apatite: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barite: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Bauxite: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Beryllium: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Borax: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()$(li)Bornite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Cobalt: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Diamond: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Electrotine: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Emerald: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Garnierite: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Ilmenite: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()", + "text": "$(li)Cassiterite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)41%$(/l)$()$(li)Certus Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Chromite: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Cobalt: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Diamond: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Electrotine: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Emerald: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Kyanite: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Lead: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Lithium: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()$(li)Mica: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Molybdenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Monazite: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Native Gold: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Native Silver: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Neodymium: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Nether Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Nickel: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Olivine: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()", + "text": "$(li)Garnierite: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)Grossular: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)Ilmenite: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Kyanite: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Lead: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Lithium: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Mica: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Molybdenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Monazite: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Platinum: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Pollucite: $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Powellite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Pyrite: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Pyrope: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Redstone: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Scheelite: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()", + "text": "$(li)Native Copper: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)Native Gold: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Native Silver: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Neodymium: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Nether Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Nickel: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Olivine: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Opal: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Platinum: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Powellite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Pyrite: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Soapstone: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Spessartine: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Talc: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Thorium: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()", + "text": "$(li)Pyrope: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Scheelite: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Soapstone: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Spessartine: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Stibnite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)Talc: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Thorium: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Zeolite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json index f8862b459..1dc09e4e9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxite & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Certus Quartz$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Emerald & Beryllium$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pyrolusite and Cobalt$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinnabar, & Ruby$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_garnet)Amethyst, Opal, & Garnet$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxite & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_cassiterite)Cassiterite & Chalcopyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Certus Quartz$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Emerald & Beryllium$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gold)Gold & Magnetite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gypsum)Gypsum & Calcite$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pyrolusite and Cobalt$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_tetrahedrite)Tetrahedrite & Chalcocite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -27,6 +27,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 230$(br)$(thing)Density$(): 0.35$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Size$(): 35$(br)$(thing)Height$(): 7$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Rhyolite", + "title": "Amethyst, Opal, & Garnet", + "type": "patchouli:text", + "anchor": "moon_garnet" + }, + { + "Type": "patchouli:multiblock", + "name": "Amethyst", + "multiblock": { + "mapping": { + "0": "#forge:ores/amethyst" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 38%$(br)$(thing)Source of$(): Iron$(br)$(thing)Formula$(): (SiO₂)₄Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Opal", + "multiblock": { + "mapping": { + "0": "#forge:ores/opal" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 38%$(br)$(thing)Source of$(): Silicon, Oxygen$(br)$(thing)Formula$(): (SiO₂)", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Yellow Garnet", + "multiblock": { + "mapping": { + "0": "#forge:ores/yellow_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 14%$(br)$(thing)Source of$(): Andradite, Grossular, Uvarovite", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Red Garnet", + "multiblock": { + "mapping": { + "0": "#forge:ores/red_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 9%$(br)$(thing)Source of$(): Pyrope, Almandine, Spessartine", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 100$(br)$(thing)Size$(): 35$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Diorite, Norite", @@ -278,6 +370,98 @@ "text": "$(thing)Percentage$(): 21%$(br)$(thing)Source of$(): Magnesium, Rutile, Titanium$(br)$(thing)Formula$(): (Mg,Fe)Ti₂O₅", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 60$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Norite", + "title": "Cassiterite & Chalcopyrite", + "type": "patchouli:text", + "anchor": "moon_cassiterite" + }, + { + "Type": "patchouli:multiblock", + "name": "Cassiterite", + "multiblock": { + "mapping": { + "0": "#forge:ores/cassiterite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 41%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Chalcopyrite", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcopyrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Melts into$(): Copper$(br)$(thing)Formula$(): CuFeS₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Tin", + "multiblock": { + "mapping": { + "0": "#forge:ores/tin" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 17%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Zeolite", + "multiblock": { + "mapping": { + "0": "#forge:ores/zeolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Aluminium, Oxygen$(br)$(thing)Formula$(): NaCa₄Si₂₇Al₉(H₂O)₂₈O₇₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 230$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Size$(): 60$(br)$(thing)Indicator Max Depth$(): 80$(br2)$(thing)Stone Types$(): Andesite, Anorthosite, Basalt, Dacite, Diorite, Gabbro, Norite, Phonolite, Rhyolite", @@ -875,6 +1059,98 @@ "text": "$(thing)Percentage$(): 14%$(br)$(thing)Smelts into$(): Cobalt$(br)$(thing)Formula$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 170$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 10 — 80$(br)$(thing)Size$(): 40$(br)$(thing)Height$(): 10$(br)$(thing)Indicator Max Depth$(): 60$(br2)$(thing)Stone Types$(): Basalt, Diorite, Granite", + "title": "Gold & Magnetite", + "type": "patchouli:text", + "anchor": "moon_gold" + }, + { + "Type": "patchouli:multiblock", + "name": "Native Gold", + "multiblock": { + "mapping": { + "0": "#forge:ores/gold" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 55%$(br)$(thing)Melts into$(): Gold$(br)$(thing)Formula$(): Au", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bauxite", + "multiblock": { + "mapping": { + "0": "#forge:ores/bauxite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Aluminium$(br)$(thing)Formula$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Magnetite", + "multiblock": { + "mapping": { + "0": "#forge:ores/magnetite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Melts into$(): Cast Iron$(br)$(thing)Formula$(): Fe₃O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Green Sapphire", + "multiblock": { + "mapping": { + "0": "#forge:ores/green_sapphire" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Aluminium$(br)$(thing)Formula$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 260$(br)$(thing)Density$(): 0.55$(br)$(thing)Type$(): Pipe Vein$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 12$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Basalt, Gabbro, Phonolite", @@ -942,6 +1218,113 @@ "text": "$(thing)Percentage$(): 10%$(br)$(thing)Source of$(): Magnesium, Iron$(br)$(thing)Formula$(): Mg₂Fe(SiO₂)₂", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Size$(): 40$(br)$(thing)Height$(): 9$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Anorthosite, Norite, Phonolite", + "title": "Gypsum & Calcite", + "type": "patchouli:text", + "anchor": "moon_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gypsum", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Used for$(): Alabaster (dyeable) bricks$(br)$(thing)Formula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcite", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Calcium$(br)$(thing)Formula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Borax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Sodium, Boron$(br)$(thing)Formula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Alunite", + "multiblock": { + "mapping": { + "0": "#forge:ores/alunite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Potassium, Aluminium$(br)$(thing)Formula$(): KAl₃Si₂H₆O₁₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Olivine", + "multiblock": { + "mapping": { + "0": "#forge:ores/olivine" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Magnesium, Iron$(br)$(thing)Formula$(): Mg₂Fe(SiO₂)₂", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Size$(): 35$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Diorite, Gabbro, Norite", @@ -1011,10 +1394,10 @@ }, { "Type": "patchouli:multiblock", - "name": "Pollucite", + "name": "Aluminium", "multiblock": { "mapping": { - "0": "#forge:ores/pollucite" + "0": "#forge:ores/aluminium" }, "pattern": [ [ @@ -1026,7 +1409,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 14%$(br)$(thing)Source of$(): Caesium, Aluminium$(br)$(thing)Formula$(): Cs₂Al₂Si₄(H₂O)₂O₁₂", + "text": "$(thing)Percentage$(): 14%$(br)$(thing)Source of$(): Aluminium$(br)$(thing)Formula$(): Al", "type": "patchouli:multiblock" }, { @@ -1857,6 +2240,98 @@ "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Iron, Titanium, Nitrogen$(br)$(thing)Formula$(): (Mg₂Fe(SiO₂)₂)₂(TiO₂)N₄", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 190$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 50 — 128$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 60$(br2)$(thing)Stone Types$(): Andesite, Dacite, Phonolite, Rhyolite", + "title": "Tetrahedrite & Chalcocite", + "type": "patchouli:text", + "anchor": "moon_tetrahedrite" + }, + { + "Type": "patchouli:multiblock", + "name": "Tetrahedrite", + "multiblock": { + "mapping": { + "0": "#forge:ores/tetrahedrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 40%$(br)$(thing)Melts into$(): Copper$(br)$(thing)Formula$(): Cu₃SbS₃Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Chalcocite", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcocite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Copper$(br)$(thing)Formula$(): Cu₂S", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Stibnite", + "multiblock": { + "mapping": { + "0": "#forge:ores/stibnite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Smelts into$(): Antimony$(br)$(thing)Formula$(): Sb₂S₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Native Copper", + "multiblock": { + "mapping": { + "0": "#forge:ores/copper" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Melts into$(): Copper$(br)$(thing)Formula$(): Cu", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.5$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Size$(): 64$(br)$(thing)Height$(): 25$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Andesite, Anorthosite, Basalt, Dacite, Diorite, Gabbro, Norite, Phonolite, Rhyolite", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json index 83564331f..00bf20f57 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json @@ -14,42 +14,42 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandine: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Alunite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Anthracite: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Apatite: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Asbestos: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Barite: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Basaltic Mineral Sands: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Bentonite: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Beryllium: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Bornite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()", + "text": "$(li)Almandine: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Alunite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Anthracite: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Apatite: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Asbestos: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Barite: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Basaltic Mineral Sands: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Bentonite: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Beryllium: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Borax: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()$(li)Bornite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Cassiterite: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cobalt: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Diamond: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Emerald: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()", + "text": "$(li)Calcite: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cobalt: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Diamond: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Fuller's Earth: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Galena: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Garnet Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Garnierite: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Goethite: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Granitic Mineral Sand: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Hematite: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Kyanite: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Lapis: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()", + "text": "$(li)Emerald: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Fuller's Earth: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Galena: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Garnet Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Garnierite: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Goethite: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Granitic Mineral Sand: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Hematite: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Kyanite: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Lazurite: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Lead: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Lithium: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Magnesite: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Malachite: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Mica: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Molybdenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Monazite: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Naquadah: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Native Copper: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Native Gold: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Neodymium: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()", + "text": "$(li)Lapis: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Lazurite: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Lead: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Lithium: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Magnesite: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Malachite: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Mica: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Molybdenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Monazite: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Naquadah: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Native Copper: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Native Gold: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Nether Quartz: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Nickel: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Olivine: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Platinum: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Plutonium: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Pollucite: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Powellite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Pyrite: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Pyrope: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()", + "text": "$(li)Neodymium: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Nether Quartz: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Nickel: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Olivine: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Platinum: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Plutonium: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Pollucite: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Powellite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Pyrite: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Quartzite: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Scheelite: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Stibnite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()", + "text": "$(li)Pyrope: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Scheelite: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Stibnite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()", + "text": "$(li)Sulfur: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Yellow Limonite: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()", + "text": "$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Yellow Limonite: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json index eef149cdd..650087f59 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json @@ -19,12 +19,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Naquadah & Plutonium$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Nether Quartz$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Soapstone, Talc, & Trona$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Naquadah & Plutonium$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Nether Quartz$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Silver, Galena, & Lead$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Sylvite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Tetrahedrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Sylvite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Tetrahedrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -1257,6 +1257,98 @@ "text": "$(thing)Percentage$(): 15%$(br)$(thing)Used for$(): Fuel, Distillation$(br)$(thing)Formula$(): C", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 32 — 128$(br)$(thing)Size$(): 40$(br)$(thing)Height$(): 9$(br2)$(thing)Stone Types$(): Migmatite, Pyroxenite, Travertine", + "title": "Gypsum & Calcite", + "type": "patchouli:text", + "anchor": "nether_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gypsum", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Used for$(): Alabaster (dyeable) bricks$(br)$(thing)Formula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcite", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 30%$(br)$(thing)Source of$(): Calcium$(br)$(thing)Formula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Borax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Sodium, Boron$(br)$(thing)Formula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Fuller's Earth", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Magnesium$(br)$(thing)Formula$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 220$(br)$(thing)Density$(): 0.45$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 128$(br)$(thing)Size$(): 35$(br2)$(thing)Stone Types$(): Basalt, Migmatite, Pyroxenite, Travertine", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json index af8ff8e08..88ba2dfe7 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Bentonita: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Berílio: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Bismuto: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Bórax: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()$(li)Bornita: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Carvão: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Chumbo: $(l:tfg_ores/earth_vein_index#normal_silver)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)11%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)7%$(/l)$()$(li)Cianita: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()", + "text": "$(li)Bentonita: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Berílio: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Bismuto: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Bórax: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()$(li)Bornita: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Carvão: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Chumbo: $(l:tfg_ores/earth_vein_index#normal_silver)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)11%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)7%$(/l)$()$(li)Cianita: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()", "type": "patchouli:text" }, { @@ -29,7 +29,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Fosfato Tricálcico: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Galena: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Garnierita: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Gipsita: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Glossulária: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Goethita: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Grafite: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)Hematita: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Lápis-lazúri: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Lazurita: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)Lepidorita: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)15%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()", + "text": "$(li)Fosfato Tricálcico: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Galena: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Garnierita: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Gipsita: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Glossulária: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Goethita: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Grafite: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)Hematita: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Lápis-lazúri: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Lazurita: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)Lepidorita: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)15%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()", "type": "patchouli:text" }, { @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Safira: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Sal: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Salitre: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Sheelita: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()$(li)Sodalita: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()", + "text": "$(li)Safira: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Sal: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Salitre: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Sheelita: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()$(li)Sodalita: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json index af283d506..f1d4c2eb5 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json @@ -19,17 +19,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Enxofre e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Esfalerita e Enxofre$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Espodumena e Lepidolita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethita e Malaquita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematita, Goethita e Rubi$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lápis-lazúri, Lazurita e Sodalita$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Enxofre e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Esfalerita e Enxofre$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Espodumena e Lepidolita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gipsita e Calcita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethita e Malaquita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematita, Goethita e Rubi$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetita e Vanádio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opala e Granada$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Ouro (Profundo)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Ouro, Limonita e Hematita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzos$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Sais e Bórax$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Sheelita e Tungstato$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lápis-lazúri, Lazurita e Sodalita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetita e Vanádio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opala e Granada$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Ouro (Profundo)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Ouro, Limonita e Hematita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzos$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Sais e Bórax$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Salitre e Eletrotina$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetraedrita (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetraedrita (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topázio e Calcocita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenita e Molibdenita$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetraedrita (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetraedrita (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topázio e Calcocita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenita e Molibdenita$()$()", "type": "patchouli:text" }, { @@ -1656,6 +1656,98 @@ "text": "$(thing)Porcentagem$(): 10%$(br)$(thing)Derrete em$(): Níquel$(br)$(thing)Fórmula$(): Ni", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 180$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 9$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Argilito, Calcário, Cherte, Conglomerado, Dolomito, Folhelho, Giz", + "title": "Gipsita e Calcita", + "type": "patchouli:text", + "anchor": "normal_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gipsita", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Usado para$(): Tijolos de Alabastro (tingíveis)$(br)$(thing)Fórmula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcita", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 30%$(br)$(thing)Fonte de$(): Cálcio$(br)$(thing)Fórmula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bórax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Fonte de$(): Sódio, Boro$(br)$(thing)Fórmula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Terra de Fuller", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Magnésio$(br)$(thing)Fórmula$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 240$(br)$(thing)Densidade$(): 0.35$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -64 — 30$(br)$(thing)Tamanho$(): 32$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Calcário, Mármore", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json new file mode 100644 index 000000000..96566acf8 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json @@ -0,0 +1,22 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Ore Index", + "icon": "tfc:ore/normal_hematite", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "Este é o $(thing)Índice de Minérios$() para $(thing)Mars$(). Todos os minérios estão ordenados alfabeticamente e do veio mais rico para o mais pobre. Você pode clicar neles para saber mais sobre cada veio.", + "title": "Mars Ore Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Hematita: $(l:tfg_ores/mars_vein_index#mars_hematite)100%$(/l)$()", + "type": "patchouli:text" + } + ], + "sortnum": 6 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json new file mode 100644 index 000000000..342df1e59 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json @@ -0,0 +1,49 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Vein Index", + "icon": "gtceu:mars_stone_hematite_ore", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "Este é o $(thing)Índice de Veios$() para $(item)Mars$(). Cada veio contém detalhes sobre sua raridade, densidade, tipo de veio, altura onde é encontrado, tamanhos, tipos de rocha em que aparece e mais.", + "title": "Mars Vein Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)(Placeholder Vein)$()$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 210$(br)$(thing)Densidade$(): 0.4$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -16 — 100$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade Máxima do Indicador$(): 50$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, Calcário, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Red Granite, Traquito", + "title": "(Placeholder Vein)", + "type": "patchouli:text", + "anchor": "mars_hematite" + }, + { + "Type": "patchouli:multiblock", + "name": "Hematita", + "multiblock": { + "mapping": { + "0": "#forge:ores/hematite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 100%$(br)$(thing)Derrete em$(): Ferro Fundido$(br)$(thing)Fórmula$(): Fe₂O₃", + "type": "patchouli:multiblock" + } + ], + "sortnum": 7 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json index aa06f97b3..35ac3acf8 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json @@ -14,27 +14,32 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandina: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Alumínio: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Apatita: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Areia Glauconita: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Armalcolita: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barita: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Bastnasita: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Bauxita: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Berílio: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Bornita: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Chumbo: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Cianita: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()", + "text": "$(li)Almandina: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Alumínio: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Alunita: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)Ametista: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Apatita: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Areia Glauconita: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Armalcolita: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barita: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Bastnasita: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Bauxita: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Berílio: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Bórax: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()$(li)Bornita: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Cobaltita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Cobalto: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Cooperita: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Cromita: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Diamante: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Eletrotina: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Esfalerita: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Esmeralda: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Espessartita: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Fosfato Tricálcico: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Garnierita: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Glossulária: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()", + "text": "$(li)Calcocita: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/moon_vein_index#moon_cassiterite)41%$(/l)$()$(li)Chumbo: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Cianita: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Cobalto: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Cobre Nativo: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)Cooperita: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Cromita: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Diamante: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Eletrotina: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Grafite: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Ilmenita: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Lítio: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetita: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()$(li)Magnetita de Vanádio: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Mica: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Molibdenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Monazita: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Neodímio: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Níquel: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Olivina: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Ouro Nativo: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()", + "text": "$(li)Esfalerita: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Esmeralda: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Espessartita: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Estanho: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Estibnita: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)Fosfato Tricálcico: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Garnierita: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Gipsita: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)Glossulária: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Grafite: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Ilmenita: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Pirita: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Pirocloro: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Pirolusita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Piropo: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Platina: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Polucita: $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Powellita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Quartzito: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Quartzo Certus: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Quartzo do Nether: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Redstone: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Rubi: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Safira: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()", + "text": "$(li)Lítio: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetita: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Magnetita de Vanádio: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Mica: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Molibdenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Monazita: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Neodímio: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Níquel: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Olivina: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Opala: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Ouro Nativo: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Pirita: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Safira Verde: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Salitre: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sheelita: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Talco: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Tantalita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Topázio: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()", + "text": "$(li)Pirocloro: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Pirolusita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Piropo: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Platina: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Powellita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Quartzito: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Quartzo Certus: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Quartzo do Nether: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Redstone: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Rubi: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Safira: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Salitre: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sheelita: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Talco: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Tantalita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Topázio: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Zeólita: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json index 5fc41c51a..b5a686893 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatita e Pirocloro$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasita e Monazita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxita e Ilmenita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Cianita, Mica e Bauxita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh e Ilmenita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pirolusita e Cobalto$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_garnet)Ametista, Opala e Granada$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatita e Pirocloro$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasita e Monazita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxita e Ilmenita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_cassiterite)Cassiterita e Calcopirita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Cianita, Mica e Bauxita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh e Ilmenita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gypsum)Gipsita e Calcita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Grafite e Diamante$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Quartzo Certus$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Topázio e Calcosita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenita e Molibdenita$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gold)Ouro e Magnetita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pirolusita e Cobalto$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Quartzo Certus$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_tetrahedrite)Tetraedrita e Calcocita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Topázio e Calcosita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenita e Molibdenita$()$()", "type": "patchouli:text" }, { @@ -27,6 +27,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 230$(br)$(thing)Densidade$(): 0.35$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Tamanho$(): 35$(br)$(thing)Altura$(): 7$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Riolito", + "title": "Ametista, Opala e Granada", + "type": "patchouli:text", + "anchor": "moon_garnet" + }, + { + "Type": "patchouli:multiblock", + "name": "Ametista", + "multiblock": { + "mapping": { + "0": "#forge:ores/amethyst" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 38%$(br)$(thing)Fonte de$(): Ferro$(br)$(thing)Fórmula$(): (SiO₂)₄Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Opala", + "multiblock": { + "mapping": { + "0": "#forge:ores/opal" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 38%$(br)$(thing)Fonte de$(): Silício, Oxigênio$(br)$(thing)Fórmula$(): (SiO₂)", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Granada Amarela", + "multiblock": { + "mapping": { + "0": "#forge:ores/yellow_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Fonte de$(): Andradita, Glossulária, Uvarovita", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Granada Vermelha", + "multiblock": { + "mapping": { + "0": "#forge:ores/red_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 9%$(br)$(thing)Fonte de$(): Piropo, Almandina, Espessartita", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 250$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 100$(br)$(thing)Tamanho$(): 35$(br)$(thing)Profundidade Máxima do Indicador$(): 50$(br2)$(thing)Tipos de Pedra$(): Anortosito, Diorito, Norito", @@ -278,6 +370,98 @@ "text": "$(thing)Porcentagem$(): 21%$(br)$(thing)Fonte de$(): Magnésio, Rutilo, Titânio$(br)$(thing)Fórmula$(): (Mg,Fe)Ti₂O₅", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 210$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade Máxima do Indicador$(): 60$(br2)$(thing)Tipos de Pedra$(): Diorito, Gabro, Granito, Norito", + "title": "Cassiterita e Calcopirita", + "type": "patchouli:text", + "anchor": "moon_cassiterite" + }, + { + "Type": "patchouli:multiblock", + "name": "Cassiterita", + "multiblock": { + "mapping": { + "0": "#forge:ores/cassiterite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 41%$(br)$(thing)Derrete em$(): Estanho$(br)$(thing)Fórmula$(): SnO₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcopirita", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcopyrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Derrete em$(): Cobre$(br)$(thing)Fórmula$(): CuFeS₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Estanho", + "multiblock": { + "mapping": { + "0": "#forge:ores/tin" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 17%$(br)$(thing)Derrete em$(): Estanho$(br)$(thing)Fórmula$(): Sn", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Zeólita", + "multiblock": { + "mapping": { + "0": "#forge:ores/zeolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 5%$(br)$(thing)Fonte de$(): Alumínio, Oxigênio$(br)$(thing)Fórmula$(): NaCa₄Si₂₇Al₉(H₂O)₂₈O₇₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 250$(br)$(thing)Densidade$(): 0.25$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Tamanho$(): 35$(br)$(thing)Profundidade Máxima do Indicador$(): 50$(br2)$(thing)Tipos de Pedra$(): Anortosito, Diorito, Gabro, Norito", @@ -347,10 +531,10 @@ }, { "Type": "patchouli:multiblock", - "name": "Polucita", + "name": "Alumínio", "multiblock": { "mapping": { - "0": "#forge:ores/pollucite" + "0": "#forge:ores/aluminium" }, "pattern": [ [ @@ -362,7 +546,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Fonte de$(): Césio, Alumínio$(br)$(thing)Fórmula$(): Cs₂Al₂Si₄(H₂O)₂O₁₂", + "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Fonte de$(): Alumínio$(br)$(thing)Fórmula$(): Al", "type": "patchouli:multiblock" }, { @@ -957,6 +1141,113 @@ "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Derrete em$(): Cobalto$(br)$(thing)Fórmula$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 180$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 9$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Anortosito, Fonolito, Norito", + "title": "Gipsita e Calcita", + "type": "patchouli:text", + "anchor": "moon_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gipsita", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Usado para$(): Tijolos de Alabastro (tingíveis)$(br)$(thing)Fórmula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcita", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 25%$(br)$(thing)Fonte de$(): Cálcio$(br)$(thing)Fórmula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bórax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Fonte de$(): Sódio, Boro$(br)$(thing)Fórmula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Alunita", + "multiblock": { + "mapping": { + "0": "#forge:ores/alunite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Potássio, Alumínio$(br)$(thing)Fórmula$(): KAl₃Si₂H₆O₁₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Olivina", + "multiblock": { + "mapping": { + "0": "#forge:ores/olivine" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 5%$(br)$(thing)Fonte de$(): Magnésio, Ferro$(br)$(thing)Fórmula$(): Mg₂Fe(SiO₂)₂", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 260$(br)$(thing)Densidade$(): 0.55$(br)$(thing)Tipo$(): Veio Tubular$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Altura$(): 60$(br)$(thing)Raio$(): 12$(br)$(thing)Profundidade Máxima do Indicador$(): 50$(br2)$(thing)Tipos de Pedra$(): Anortosito, Basalto, Basalto, Fonolito, Gabro", @@ -1116,6 +1407,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 170$(br)$(thing)Densidade$(): 0.4$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 10 — 80$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 10$(br)$(thing)Profundidade Máxima do Indicador$(): 60$(br2)$(thing)Tipos de Pedra$(): Basalto, Diorito, Granito", + "title": "Ouro e Magnetita", + "type": "patchouli:text", + "anchor": "moon_gold" + }, + { + "Type": "patchouli:multiblock", + "name": "Ouro Nativo", + "multiblock": { + "mapping": { + "0": "#forge:ores/gold" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 55%$(br)$(thing)Derrete em$(): Ouro$(br)$(thing)Fórmula$(): Au", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bauxita", + "multiblock": { + "mapping": { + "0": "#forge:ores/bauxite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Fonte de$(): Alumínio$(br)$(thing)Fórmula$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Magnetita", + "multiblock": { + "mapping": { + "0": "#forge:ores/magnetite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Derrete em$(): Ferro Fundido$(br)$(thing)Fórmula$(): Fe₃O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Safira Verde", + "multiblock": { + "mapping": { + "0": "#forge:ores/green_sapphire" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 5%$(br)$(thing)Fonte de$(): Aluminium$(br)$(thing)Fórmula$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 190$(br)$(thing)Densidade$(): 0.25$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 66$(br)$(thing)Tamanho$(): 36$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Anortosito, Basalto, Diorito, Gabro, Norito", @@ -1857,6 +2240,98 @@ "text": "$(thing)Porcentagem$(): 10%$(br)$(thing)Fonte de$(): Lítio$(br)$(thing)Fórmula$(): Li", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 190$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 50 — 128$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade Máxima do Indicador$(): 60$(br2)$(thing)Tipos de Pedra$(): Andesito, Dacito, Fonolito, Riolito", + "title": "Tetraedrita e Calcocita", + "type": "patchouli:text", + "anchor": "moon_tetrahedrite" + }, + { + "Type": "patchouli:multiblock", + "name": "Tetraedrita", + "multiblock": { + "mapping": { + "0": "#forge:ores/tetrahedrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 40%$(br)$(thing)Derrete em$(): Cobre$(br)$(thing)Fórmula$(): Cu₃SbS₃Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcocita", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcocite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 25%$(br)$(thing)Fonte de$(): Cobre$(br)$(thing)Fórmula$(): Cu₂S", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Estibnita", + "multiblock": { + "mapping": { + "0": "#forge:ores/stibnite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Derrete em$(): Antimônio$(br)$(thing)Fórmula$(): Sb₂S₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Cobre Nativo", + "multiblock": { + "mapping": { + "0": "#forge:ores/copper" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Derrete em$(): Cobre$(br)$(thing)Fórmula$(): Cu", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 210$(br)$(thing)Densidade$(): 0.5$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Tamanho$(): 64$(br)$(thing)Altura$(): 25$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Andesito, Anortosito, Basalto, Dacito, Diorito, Fonolito, Gabro, Norito, Riolito", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json index b81e60be6..1c66924f1 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json @@ -19,37 +19,37 @@ }, { "Type": "patchouli:text", - "text": "$(li)Berílio: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Bornita: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Carvão: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Chumbo: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Cianita: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cobalto: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobre Nativo: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Cooperita: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", + "text": "$(li)Berílio: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Bórax: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()$(li)Bornita: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Carvão: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Chumbo: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Cianita: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cobalto: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobre Nativo: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Cromita: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Diamante: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomita: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Eletrotina: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Enxofre: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Esfalerita: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Esmeralda: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Espessartita: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Estanho: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Estibnita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Fosfato Tricálcico: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Galena: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Garnierita: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Gipsita: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()", + "text": "$(li)Cooperita: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Cromita: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Diamante: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomita: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Eletrotina: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Enxofre: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Esfalerita: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Esmeralda: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Espessartita: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Estanho: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Estibnita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Fosfato Tricálcico: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Galena: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Garnierita: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Glossulária: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Goethita: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Grafite: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Hematita: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Lápis-lazúri: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Lazurita: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Lítio: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Magnesita: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Magnetita: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Magnetita de Vanádio: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Malaquita: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()", + "text": "$(li)Gipsita: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Glossulária: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Goethita: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Grafite: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Hematita: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Lápis-lazúri: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Lazurita: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Lítio: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Magnesita: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Magnetita: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Magnetita de Vanádio: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Mica: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Molibdenita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Monazita: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Naquadah: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Neodímio: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Níquel: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Olivina: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Opala: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Ouro Nativo: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Pechblenda: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Pirita: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Pirocloro: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()", + "text": "$(li)Malaquita: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Mica: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Molibdenita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Monazita: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Naquadah: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Neodímio: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Níquel: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Olivina: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Opala: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Ouro Nativo: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Pechblenda: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Pirita: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Pirolusita: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Piropo: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Platina: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Plutônio: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Polucita: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Powellita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Quartzito: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Quartzo do Nether: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rubi: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Safira: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()", + "text": "$(li)Pirocloro: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Pirolusita: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Piropo: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Platina: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Plutônio: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Polucita: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Powellita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Quartzito: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Quartzo do Nether: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rubi: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Safira: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Salitre: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sheelita: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Silvita: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Sodalita: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninita: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()", + "text": "$(li)Sal-gema: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Salitre: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sheelita: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Silvita: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Sodalita: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Wulfenita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()", + "text": "$(li)Uraninita: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json index 40320e307..61c1ee0fd 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json @@ -19,12 +19,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Goethita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Lápis-lazúri, Lazurita e Sodalita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Naquadah e Plutônio$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Nether Quartzo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Ouro e Hematita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Safira e Almandina$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gypsum)Gipsita e Calcita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Goethita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Lápis-lazúri, Lazurita e Sodalita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Naquadah e Plutônio$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Nether Quartzo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Ouro e Hematita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Redstone, Cinábrio e Rubi$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Silvita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Tetraedrita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Topázio e Calcosita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Wulfenita e Molibdenita$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Silvita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Tetraedrita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Topázio e Calcosita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Wulfenita e Molibdenita$()$()", "type": "patchouli:text" }, { @@ -1207,6 +1207,98 @@ "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Derrete em$(): Cobalto$(br)$(thing)Fórmula$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 180$(br)$(thing)Densidade$(): 0.4$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 32 — 128$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 9$(br2)$(thing)Tipos de Pedra$(): Migmatito, Piroxenito, Travertino", + "title": "Gipsita e Calcita", + "type": "patchouli:text", + "anchor": "nether_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gipsita", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Usado para$(): Tijolos de Alabastro (tingíveis)$(br)$(thing)Fórmula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcita", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 30%$(br)$(thing)Fonte de$(): Cálcio$(br)$(thing)Fórmula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bórax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Fonte de$(): Sódio, Boro$(br)$(thing)Fórmula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Terra de Fuller", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Magnésio$(br)$(thing)Fórmula$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 240$(br)$(thing)Densidade$(): 0.45$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 128$(br)$(thing)Tamanho$(): 37$(br2)$(thing)Tipos de Pedra$(): Basalto, Migmatito, Piroxenito, Travertino", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json index b703b7402..fe2c9cc1f 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)Алмаз: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Алунит: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Аметист: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Апатит: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Асбест: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Базальтовый минеральный песок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Бентонит: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Бериллий: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Борнит: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", + "text": "$(li)Алмаз: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Алунит: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Аметист: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Апатит: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Асбест: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Базальтовый минеральный песок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Бентонит: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Бериллий: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Борнит: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Ванадий магнетит: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l)$()$(li)Висмут: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l)$()$(li)Галена: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Гематит: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Гётит: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Гипс: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Гранатовый песок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Гранитовый минеральный песок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Графит: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()", + "text": "$(li)Ванадий магнетит: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l)$()$(li)Висмут: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l)$()$(li)Галена: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Гематит: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Гётит: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Гипс: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Гранатовый песок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Гранитовый минеральный песок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Графит: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Диатомовый пелит: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)Жёлтый гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Жёлтый лимонит: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)Кальцит: $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Касситерит: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Касситеритовый песок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Киноварь: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()", + "text": "$(li)Диатомовый пелит: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)Жёлтый гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Жёлтый лимонит: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)Кальцит: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Касситерит: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Касситеритовый песок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Киноварь: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()", "type": "patchouli:text" }, { @@ -39,7 +39,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Самородная Медь: $(l:tfg_ores/earth_vein_index#normal_copper)65%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)30%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l)$()$(li)Сапфир: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Свинец: $(l:tfg_ores/earth_vein_index#normal_silver)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)11%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)7%$(/l)$()$(li)Селитра: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Сера: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Смектическая глина: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Содалит: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Соль: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Спасерит: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()$(li)Сподумен: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Стибнит: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()", + "text": "$(li)Самородная Медь: $(l:tfg_ores/earth_vein_index#normal_copper)65%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)30%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l)$()$(li)Сапфир: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Свинец: $(l:tfg_ores/earth_vein_index#normal_silver)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)11%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)7%$(/l)$()$(li)Селитра: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Сера: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Смектическая глина: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)Содалит: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Соль: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Спасерит: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()$(li)Сподумен: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Стибнит: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json index 250943cff..de5fe2c10 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Аметист и гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Бентонит и Оливин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Висмут (Обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Висмут (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Гематит, Гётит, Рубин$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Гётит и Малахит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Гранатовый и Касситеритовый песок$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Золото (Глубокое)$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Аметист и гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Бентонит и Оливин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Висмут (Обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Висмут (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Гематит, Гётит, Рубин$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Гётит и Малахит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Гипс и Кальцит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Гранатовый и Касситеритовый песок$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Графит и Алмаз$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Золото, Лимонит и Гематит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Касситерит (Обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Касситерит (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Кварцы$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Лазурит, Лазурит 2 и Содалит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Лимонит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Магнетит и Ванадий$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Минеральные пески$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Нефтеносный песок$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Опал и гранат$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Золото (Глубокое)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Золото, Лимонит и Гематит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Касситерит (Обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Касситерит (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Кварцы$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Лазурит, Лазурит 2 и Содалит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Лимонит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Магнетит и Ванадий$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Минеральные пески$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Нефтеносный песок$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Сера и Пирит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Соли и Бура$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Сподумен и Лепидолит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Сфалерит и Сера$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Тетраэдрит (обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Тетраэдрит (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Уголь$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Уранинит и Уранит$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Опал и гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Сера и Пирит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Соли и Бура$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Сподумен и Лепидолит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Сфалерит и Сера$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Тетраэдрит (обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Тетраэдрит (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Уголь$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Халькопирит и Реальгар$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Хромит и Магнетит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Шелдонит и Борнит$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Уранинит и Уранит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Халькопирит и Реальгар$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Хромит и Магнетит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Шелдонит и Борнит$()$()", "type": "patchouli:text" }, { @@ -954,6 +954,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): -32 — 60$(br)$(thing)Размер$(): 40$(br)$(thing)Высота$(): 9$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Аргиллит, Доломит, Известняк, Конгломерат, Кремнистый сланец, Мел, Сланец", + "title": "Гипс и Кальцит", + "type": "patchouli:text", + "anchor": "normal_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гипс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Используется для$(): Алебастр (можно покрасить) и его кирпичи$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 30%$(br)$(thing)Хромит$(): Кальций$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Хромит$(): Натрий, Бор$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Смектическая глина", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Магний$(br)$(thing)Формула$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 270$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -40 — 64$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 60$(br2)$(thing)Виды камней$(): Андезит, Аргиллит, Аспидный сланец, Базальт, Габбро, Гнейс, Гранит, Дацит, Диорит, Доломит, Известняк, Кварцит, Конгломерат, Кремнистый сланец, Мел, Мрамор, Риолит, Сланец, Филлит, Шиферный сланец", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json new file mode 100644 index 000000000..eed6edcfa --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json @@ -0,0 +1,22 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Ore Index", + "icon": "tfc:ore/normal_hematite", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "This is the $(thing)Ore Index$() for $(thing)Mars$(). All ores are sorted alphabetically and then by richest to poorest vein type. You can click on them to learn more information about each vein.", + "title": "Mars Ore Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Гематит: $(l:tfg_ores/mars_vein_index#mars_hematite)100%$(/l)$()", + "type": "patchouli:text" + } + ], + "sortnum": 6 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json new file mode 100644 index 000000000..be2bb0d86 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json @@ -0,0 +1,49 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Vein Index", + "icon": "gtceu:mars_stone_hematite_ore", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "This is the $(thing)Vein Index$() for $(thing)Mars$(). Each Vein has details regarding its rarity, density, vein type, height found, sizes, what stones it spawns on, and more.", + "title": "Mars Vein Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)(Placeholder Vein)$()$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 210$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -16 — 100$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Red Granite, Аргиллит, Аргиллит, Базальт, Габбро, Гранит, Дацит, Диорит, Доломит, Известняк, Конгломерат, Кремнистый сланец, Мел, Сланец, Трахит", + "title": "(Placeholder Vein)", + "type": "patchouli:text", + "anchor": "mars_hematite" + }, + { + "Type": "patchouli:multiblock", + "name": "Гематит", + "multiblock": { + "mapping": { + "0": "#forge:ores/hematite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 100%$(br)$(thing)Плавится в$(): Железо$(br)$(thing)Формула$(): Fe₂O₃", + "type": "patchouli:multiblock" + } + ], + "sortnum": 7 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json index a1aedfda5..5c409537b 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json @@ -14,27 +14,32 @@ }, { "Type": "patchouli:text", - "text": "$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Алмаз: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Альмандин: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюминий: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Бериллий: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Борнит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Ванадий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()", + "text": "$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Алмаз: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Алунит: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюминий: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Аметист: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Бериллий: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Борнит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Графит: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Ильменит: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Истинный кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Киноварь: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()", + "text": "$(li)Ванадий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Гипс: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Графит: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Жёлтый гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)Изумруд: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Ильменит: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Истинный кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Литий: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()$(li)Молибденит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Монацит: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Незер-кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Неодим: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Никель: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Оливин: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Пентландит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Пирит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Пироп: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()", + "text": "$(li)Кальцит: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Касситерит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)41%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Киноварь: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Литий: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Молибденит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Монацит: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Незер-кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Платина: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Повеллит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Поллуцит: $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Редстоун: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Рубин: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Самородная Золото: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Свинец: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Селитра: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Спасерит: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()", + "text": "$(li)Неодим: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Никель: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Оливин: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Олово: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Опал: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Пирит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Пироп: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Платина: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Повеллит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Редстоун: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Рубин: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Тальк: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Танталит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькозин: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Хромит: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Ционит: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Шеелит: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Электротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()", + "text": "$(li)Самородная Золото: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Самородная Медь: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Свинец: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Селитра: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Спасерит: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Стибнит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Тальк: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Танталит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Тетраэдрит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькозин: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Хромит: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Цеолит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)Ционит: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Шеелит: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Электротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json index 321621d68..f0c0f0daf 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pyrolusite and Cobalt$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит и Ильменит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Истинный кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Сапфир и Альмандин$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pyrolusite and Cobalt$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnet)Аметист, Опал и гранат$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит и Ильменит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gypsum)Гипс и Кальцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gold)Золото и Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Истинный кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_cassiterite)Касситерит и Халькопирит$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Хромит и Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Шелдонит и Борнит$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_tetrahedrite)Тетраэдрит и Халькозин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Хромит и Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Шелдонит и Борнит$()$()", "type": "patchouli:text" }, { @@ -211,6 +211,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 230$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 10 — 128$(br)$(thing)Размер$(): 35$(br)$(thing)Высота$(): 7$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Андезит, Базальт, Риолит", + "title": "Аметист, Опал и гранат", + "type": "patchouli:text", + "anchor": "moon_garnet" + }, + { + "Type": "patchouli:multiblock", + "name": "Аметист", + "multiblock": { + "mapping": { + "0": "#forge:ores/amethyst" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 38%$(br)$(thing)Хромит$(): Железо$(br)$(thing)Формула$(): (SiO₂)₄Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Опал", + "multiblock": { + "mapping": { + "0": "#forge:ores/opal" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 38%$(br)$(thing)Хромит$(): Кремний, Кислород$(br)$(thing)Формула$(): (SiO₂)", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Жёлтый гранат", + "multiblock": { + "mapping": { + "0": "#forge:ores/yellow_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 14%$(br)$(thing)Хромит$(): Андрадит, Гроссуляр, Уваровит", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Красный гранат", + "multiblock": { + "mapping": { + "0": "#forge:ores/red_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 9%$(br)$(thing)Хромит$(): Пироп, Альмандин, Спасерит", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 0 — 100$(br)$(thing)Размер$(): 35$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Диорит, Норит", @@ -661,6 +753,113 @@ "text": "$(thing)Процент руды$(): 14%$(br)$(thing)Плавится в$(): Кобальт$(br)$(thing)Формула$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 10 — 100$(br)$(thing)Размер$(): 40$(br)$(thing)Высота$(): 9$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Анортозит, Норит, Фонолит", + "title": "Гипс и Кальцит", + "type": "patchouli:text", + "anchor": "moon_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гипс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Используется для$(): Алебастр (можно покрасить) и его кирпичи$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 25%$(br)$(thing)Хромит$(): Кальций$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Хромит$(): Натрий, Бор$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Алунит", + "multiblock": { + "mapping": { + "0": "#forge:ores/alunite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Калий, Алюминий$(br)$(thing)Формула$(): KAl₃Si₂H₆O₁₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Оливин", + "multiblock": { + "mapping": { + "0": "#forge:ores/olivine" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 5%$(br)$(thing)Хромит$(): Магний, Железо$(br)$(thing)Формула$(): Mg₂Fe(SiO₂)₂", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 260$(br)$(thing)Плотность$(): 0.55$(br)$(thing)Вид$(): трубчатая жила$(br)$(thing)Y-уровень$(): 0 — 120$(br)$(thing)Высота$(): 60$(br)$(thing)Радиус$(): 12$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Базальт, Габбро, Фонолит", @@ -728,6 +927,98 @@ "text": "$(thing)Процент руды$(): 10%$(br)$(thing)Хромит$(): Магний, Железо$(br)$(thing)Формула$(): Mg₂Fe(SiO₂)₂", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 170$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 10 — 80$(br)$(thing)Размер$(): 40$(br)$(thing)Высота$(): 10$(br)$(thing)Индикатор Max Depth$(): 60$(br2)$(thing)Виды камней$(): Базальт, Гранит, Диорит", + "title": "Золото и Магнетит", + "type": "patchouli:text", + "anchor": "moon_gold" + }, + { + "Type": "patchouli:multiblock", + "name": "Самородная Золото", + "multiblock": { + "mapping": { + "0": "#forge:ores/gold" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 55%$(br)$(thing)Плавится в$(): Золото$(br)$(thing)Формула$(): Au", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Боксит", + "multiblock": { + "mapping": { + "0": "#forge:ores/bauxite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Хромит$(): Алюминий$(br)$(thing)Формула$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Магнетит", + "multiblock": { + "mapping": { + "0": "#forge:ores/magnetite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Плавится в$(): Железо$(br)$(thing)Формула$(): Fe₃O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Зелёный сапфир", + "multiblock": { + "mapping": { + "0": "#forge:ores/green_sapphire" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 5%$(br)$(thing)Хромит$(): Алюминий$(br)$(thing)Формула$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 260$(br)$(thing)Плотность$(): 0.45$(br)$(thing)Вид$(): трубчатая жила$(br)$(thing)Y-уровень$(): 0 — 120$(br)$(thing)Высота$(): 70$(br)$(thing)Радиус$(): 10$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Фонолит", @@ -927,6 +1218,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 210$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 10 — 128$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 60$(br2)$(thing)Виды камней$(): Габбро, Гранит, Диорит, Норит", + "title": "Касситерит и Халькопирит", + "type": "patchouli:text", + "anchor": "moon_cassiterite" + }, + { + "Type": "patchouli:multiblock", + "name": "Касситерит", + "multiblock": { + "mapping": { + "0": "#forge:ores/cassiterite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 41%$(br)$(thing)Плавится в$(): Олово$(br)$(thing)Формула$(): SnO₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Халькопирит", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcopyrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Плавится в$(): Медь$(br)$(thing)Формула$(): CuFeS₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Олово", + "multiblock": { + "mapping": { + "0": "#forge:ores/tin" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 17%$(br)$(thing)Плавится в$(): Олово$(br)$(thing)Формула$(): Sn", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Цеолит", + "multiblock": { + "mapping": { + "0": "#forge:ores/zeolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 5%$(br)$(thing)Хромит$(): Алюминий, Кислород$(br)$(thing)Формула$(): NaCa₄Si₂₇Al₉(H₂O)₂₈O₇₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 215$(br)$(thing)Плотность$(): 0.5$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 5 — 80$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Андезит, Базальт, Базальт, Габбро, Дацит, Норит", @@ -1576,6 +1959,98 @@ "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Source of$(): Iron, Titanium, Nitrogen$(br)$(thing)Формула$(): (Mg₂Fe(SiO₂)₂)₂(TiO₂)N₄", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 190$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 50 — 128$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 60$(br2)$(thing)Виды камней$(): Андезит, Дацит, Риолит, Фонолит", + "title": "Тетраэдрит и Халькозин", + "type": "patchouli:text", + "anchor": "moon_tetrahedrite" + }, + { + "Type": "patchouli:multiblock", + "name": "Тетраэдрит", + "multiblock": { + "mapping": { + "0": "#forge:ores/tetrahedrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 40%$(br)$(thing)Плавится в$(): Медь$(br)$(thing)Формула$(): Cu₃SbS₃Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Халькозин", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcocite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 25%$(br)$(thing)Хромит$(): Медь$(br)$(thing)Формула$(): Cu₂S", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Стибнит", + "multiblock": { + "mapping": { + "0": "#forge:ores/stibnite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Плавится в$(): Сурьма$(br)$(thing)Формула$(): Sb₂S₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Самородная Медь", + "multiblock": { + "mapping": { + "0": "#forge:ores/copper" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Плавится в$(): Медь$(br)$(thing)Формула$(): Cu", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 210$(br)$(thing)Плотность$(): 0.5$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 0 — 120$(br)$(thing)Размер$(): 64$(br)$(thing)Высота$(): 25$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Андезит, Анортозит, Базальт, Габбро, Дацит, Диорит, Норит, Риолит, Фонолит", @@ -1844,10 +2319,10 @@ }, { "Type": "patchouli:multiblock", - "name": "Поллуцит", + "name": "Алюминий", "multiblock": { "mapping": { - "0": "#forge:ores/pollucite" + "0": "#forge:ores/aluminium" }, "pattern": [ [ @@ -1859,7 +2334,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 14%$(br)$(thing)Хромит$(): Цезий, Алюминий$(br)$(thing)Формула$(): Cs₂Al₂Si₄(H₂O)₂O₁₂", + "text": "$(thing)Процент руды$(): 14%$(br)$(thing)Хромит$(): Алюминий$(br)$(thing)Формула$(): Al", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json index cde28843c..300a62224 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json @@ -14,42 +14,42 @@ }, { "Type": "patchouli:text", - "text": "$(li)Алмаз: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Алунит: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Аметист: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Антрацит: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Апатит: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Асбест: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Базальтовый минеральный песок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Бентонит: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Бериллий: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Борнит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Ванадий магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()", + "text": "$(li)Алмаз: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Алунит: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Аметист: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Антрацит: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Апатит: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Асбест: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Базальтовый минеральный песок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Бентонит: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Бериллий: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Борнит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Вольфрамат: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Галена: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Гематит: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Гётит: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Гипс: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Гранатовый песок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Гранитовый минеральный песок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Графит: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Диатомовый пелит: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Жёлтый гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()", + "text": "$(li)Ванадий магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Галена: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Гематит: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Гётит: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Гипс: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Гранатовый песок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Гранитовый минеральный песок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Графит: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Диатомовый пелит: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Жёлтый лимонит: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Кальцит: $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Касситерит: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Касситеритовый песок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Киноварь: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Лазурит: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Лазурит 2: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()", + "text": "$(li)Жёлтый гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Жёлтый лимонит: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Кальцит: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Касситерит: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Касситеритовый песок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Киноварь: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Лазурит: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Литий: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Магнезит: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Малахит: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Молибденит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Монацит: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Наквада: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Незер-кварц: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Неодим: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Никель: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Оливин: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Олово: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Опал: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()", + "text": "$(li)Лазурит 2: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Литий: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Магнезит: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Малахит: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Молибденит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Монацит: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Наквада: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Незер-кварц: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Неодим: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Никель: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Оливин: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Олово: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Пентландит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Пирит: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Пироп: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Платина: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Плутоний: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Повеллит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Поллуцит: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Редстоун: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Рубин: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Самородная Золото: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Самородная Медь: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()", + "text": "$(li)Опал: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Пирит: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Пироп: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Платина: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Плутоний: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Повеллит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Поллуцит: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Редстоун: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Рубин: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Самородная Золото: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Самородная Медь: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Сапфир: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Свинец: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Селитра: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Сера: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Сильвин: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Смектическая глина: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Содалит: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Спасерит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Стибнит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Танталит: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()", + "text": "$(li)Самородная Серебро: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сапфир: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Свинец: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Селитра: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Сера: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Сильвин: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Смектическая глина: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Содалит: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Спасерит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Стибнит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Тетраэдрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уголь: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Уранинит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Халькозин: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Хромит: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Ционит: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Шеелит: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", + "text": "$(li)Танталит: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Тетраэдрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уголь: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Уранинит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Халькозин: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Хромит: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Ционит: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Шеелит: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Электротин: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()", + "text": "$(li)Шелдонит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Электротин: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json index 33329634b..7aacf0c1d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnet)Аметист, Опал и гранат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_anthracite)Антрацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_olivine)Бентонит и Оливин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Гётит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Гранатовый и Касситеритовый песок$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Золото и Гематит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_cassiterite)Касситерит$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnet)Аметист, Опал и гранат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_anthracite)Антрацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_olivine)Бентонит и Оливин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Гётит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gypsum)Гипс и Кальцит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Гранатовый и Касситеритовый песок$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Золото и Гематит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_beryllium)Изумруд и Бериллий$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Лазурит, Лазурит 2 и Содалит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Минеральные пески$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Наквада и Плутоний$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Незер-кварц$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Сера и Пирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Сильвин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Сфалерит & Пирит$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_cassiterite)Касситерит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Лазурит, Лазурит 2 и Содалит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Минеральные пески$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Наквада и Плутоний$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Незер-кварц$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Сера и Пирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Сильвин$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Тетраэдрит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Уранинит и Уранит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_magnetite)Хромит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sheldonite)Шелдонит и Борнит$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Тетраэдрит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Уранинит и Уранит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_magnetite)Хромит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sheldonite)Шелдонит и Борнит$()$()", "type": "patchouli:text" }, { @@ -770,6 +770,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 32 — 128$(br)$(thing)Размер$(): 40$(br)$(thing)Высота$(): 9$(br2)$(thing)Виды камней$(): Мигматит, Пироксенит, Травертин", + "title": "Гипс и Кальцит", + "type": "patchouli:text", + "anchor": "nether_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гипс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Используется для$(): Алебастр (можно покрасить) и его кирпичи$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 30%$(br)$(thing)Хромит$(): Кальций$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Хромит$(): Натрий, Бор$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Смектическая глина", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Магний$(br)$(thing)Формула$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 270$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 24 — 128$(br)$(thing)Размер$(): 45$(br2)$(thing)Виды камней$(): Аспидный сланец, Габбро, Гнейс, Гранит, Диорит, Мигматит, Пироксенит, Травертин", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json index 7b592eff5..fad37fa7e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)Азбест: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Алмандін: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Аметист: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Апатит: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Базальтовий мінеральний пісок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Бентоніт: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Берилій: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Борніт: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", + "text": "$(li)Азбест: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Алмандін: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Аметист: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Апатит: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Базальтовий мінеральний пісок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Бентоніт: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Берилій: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Борніт: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Ванадієвий магнетит: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l)$()$(li)Вісмут: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Вольфрам: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Вугілля: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l)$()$(li)Галена: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Гематит: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Гетит: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Гіпс: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Гранатовий пісок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Гранітний мінеральний пісок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()", + "text": "$(li)Ванадієвий магнетит: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l)$()$(li)Вісмут: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Вольфрам: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Вугілля: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l)$()$(li)Галена: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Гематит: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Гетит: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Гіпс: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Гранатовий пісок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Гранітний мінеральний пісок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Гроссуляр: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Діамант: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Діатомітн: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)Електротин: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Земля Фуллера: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Кальцит: $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Каситерит: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Каситеритові піски: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()", + "text": "$(li)Гроссуляр: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Діамант: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Діатомітн: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)Електротин: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Земля Фуллера: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)Кальцит: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Каситерит: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Каситеритові піски: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json index c697c4f35..312cbcd35 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Аметист і Гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Бентоніт та Олівін$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Вісмут (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Вісмут (Поверхня)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Вугілля$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Гематит, Гетит і Рубін$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Гетит і Малахіт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Гранат і Каситеритові піски$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Графіт і Діамант$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Аметист і Гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Бентоніт та Олівін$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Вісмут (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Вісмут (Поверхня)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Вугілля$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Гематит, Гетит і Рубін$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Гетит і Малахіт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Гіпс і Кальцит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Гранат і Каситеритові піски$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Золото (Глибоке)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Золото, Лімоніт та Гематит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Каситерит (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Каситерит (Поверхнивий)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Кварц$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Лапіс, Лазурит та Содаліт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Лімоніт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Магнетит і Ванадій$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Мінеральні піски$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Нафтові піски$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Опал і Гранат$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Золото (Глибоке)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Золото, Лімоніт та Гематит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Каситерит (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Каситерит (Поверхнивий)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Кварц$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Лапіс, Лазурит та Содаліт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Лімоніт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Магнетит і Ванадій$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Мінеральні піски$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Нафтові піски$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Сірка та Пірит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Солі та Бура$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Сподумен та Лепідоліт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Сфалерит і Сірка$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Тетраедрит (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Тетраедрит (Поверхня)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Топаз і Халькоцит$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Опал і Гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Сірка та Пірит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Солі та Бура$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Сподумен та Лепідоліт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Сфалерит і Сірка$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Тетраедрит (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Тетраедрит (Поверхня)$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Ураніт & Пітчбленд$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Халькопірит та Реальгар$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Хроміт і Магнетит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Шелдоніт і Борніт$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Ураніт & Пітчбленд$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Халькопірит та Реальгар$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Хроміт і Магнетит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Шелдоніт і Борніт$()$()", "type": "patchouli:text" }, { @@ -981,6 +981,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Розмір$(): 40$(br)$(thing)Висота$(): 9$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Аргиліт, Вапняк, Глинистий сланець, Доломіт, Конгломерат, Крейда, Кременистий сланець", + "title": "Гіпс і Кальцит", + "type": "patchouli:text", + "anchor": "normal_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гіпс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Використовується для$(): Алебастрової (фарбованої) цегли$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 30%$(br)$(thing)Джерело$(): Кальцію$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Джерело$(): Натрію, Бору$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Земля Фуллера", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Магнезії$(br)$(thing)Формула$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 270$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -40 — 64$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 60$(br2)$(thing)Типи каменю$(): Андезит, Аргиліт, Аспідний сланець, Базальт, Вапняк, Габро, Глинистий сланець, Гнейс, Граніт, Дацит, Діорит, Доломіт, Кварцит, Конгломерат, Крейда, Кременистий сланець, Мармур, Ріоліт, Філіт, Шиферний сланець", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json new file mode 100644 index 000000000..f6aab2f2c --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json @@ -0,0 +1,22 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Ore Index", + "icon": "tfc:ore/normal_hematite", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "Це $(thing)Індекс руд$() для $(thing)Mars$(). Усі руди відсортовані в алфавітному порядку, а потім — від найбагатших до найбідніших жил. Ви можете натиснути на них, щоб дізнатися більше про кожну жилу.", + "title": "Mars Ore Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Гематит: $(l:tfg_ores/mars_vein_index#mars_hematite)100%$(/l)$()", + "type": "patchouli:text" + } + ], + "sortnum": 6 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json new file mode 100644 index 000000000..7151068ee --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json @@ -0,0 +1,49 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Vein Index", + "icon": "gtceu:mars_stone_hematite_ore", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "Це $(thing)Індекс жил$() для $(thing)Mars$(). Кожна жила містить інформацію про її рідкісність, щільність, тип, висоту залягання, розміри, породи, в яких вона з’являється, та інше.", + "title": "Mars Vein Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)(Placeholder Vein)$()$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 210$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -16 — 100$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Red Granite, Аргиліт, Аргіліт, Базальт, Вапняк, Габро, Глинистий сланець, Граніт, Дацит, Діорит, Доломіт, Конгломерат, Крейда, Кременистий сланець, Трахіт", + "title": "(Placeholder Vein)", + "type": "patchouli:text", + "anchor": "mars_hematite" + }, + { + "Type": "patchouli:multiblock", + "name": "Гематит", + "multiblock": { + "mapping": { + "0": "#forge:ores/hematite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 100%$(br)$(thing)Розплавляється в$(): Чавун$(br)$(thing)Формула$(): Fe₂O₃", + "type": "patchouli:multiblock" + } + ], + "sortnum": 7 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json index 4a4f9eb83..1f690bd55 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json @@ -14,27 +14,32 @@ }, { "Type": "patchouli:text", - "text": "$(li)Алмандін: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюмінію: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Армолколіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Берилій: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Борніт: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Ванадієвий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Вольфрам: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()", + "text": "$(li)Алмандін: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)Алюмінію: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Аметист: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Армолколіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Берилій: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Борніт: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()$(li)Ванадієвий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Гарнієрит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Деш: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Діамант: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Електротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Ільменіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Кіновар: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()", + "text": "$(li)Вольфрам: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Гіпс: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Деш: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Діамант: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Електротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)Ільменіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Літій: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()$(li)Молібденіт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Монацит: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Неодим: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Нікель: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Нітрат калію: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Оливін: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Пентландит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Пірит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Піроп: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()", + "text": "$(li)Кальцит: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Каситерит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)41%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Кіновар: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Літій: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Молібденіт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Монацит: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Неодим: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Пірохлор: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Платина: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Повеліт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Поклади Істинного Кварцу: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Полюцит: $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Редстоун: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Рубін: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Самородна Золото: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Свинець: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Слюда: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Смарагд: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Соапостон: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()", + "text": "$(li)Нікель: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Нітрат калію: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Оливін: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Олово: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Опал: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Пірит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Піроп: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Пірохлор: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Платина: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Повеліт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Поклади Істинного Кварцу: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Редстоун: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Спесартін: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Тальк: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Танталіт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()", + "text": "$(li)Рубін: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Самородна Золото: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Самородна Мідь: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Свинець: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Слюда: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Смарагд: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Соапостон: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Спесартін: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Стибніт: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Тальк: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Танталіт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Тетраедрит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Цеоліт: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json index 2418dc197..2b294db35 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Деш і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Істинний Кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Піролюзит і Кобальт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Селітра та Електротин$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_garnet)Аметист, Опал і Гранат$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gypsum)Гіпс і Кальцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Деш і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gold)Золото і Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Істинний Кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_cassiterite)Каситерит і Халькопірит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Марганець і Тантал$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Хроміт і Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Шелдоніт і Борніт$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Піролюзит і Кобальт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_tetrahedrite)Тетраедрит і Халькоцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Хроміт і Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Шелдоніт і Борніт$()$()", "type": "patchouli:text" }, { @@ -27,6 +27,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 230$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Розмір$(): 35$(br)$(thing)Висота$(): 7$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Андезит, Базальт, Ріоліт", + "title": "Аметист, Опал і Гранат", + "type": "patchouli:text", + "anchor": "moon_garnet" + }, + { + "Type": "patchouli:multiblock", + "name": "Аметист", + "multiblock": { + "mapping": { + "0": "#forge:ores/amethyst" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 38%$(br)$(thing)Джерело$(): Залізо$(br)$(thing)Формула$(): (SiO₂)₄Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Опал", + "multiblock": { + "mapping": { + "0": "#forge:ores/opal" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 38%$(br)$(thing)Джерело$(): Кремнію, Кисню$(br)$(thing)Формула$(): (SiO₂)", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Жовтий гранат", + "multiblock": { + "mapping": { + "0": "#forge:ores/yellow_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 14%$(br)$(thing)Джерело$(): Андрадиту, Гросулару, Уваровіту", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Червоний гранат", + "multiblock": { + "mapping": { + "0": "#forge:ores/red_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 9%$(br)$(thing)Джерело$(): Піроп, Алмадін, Спесартін", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 0 — 100$(br)$(thing)Розмір$(): 35$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Діорит, Норит", @@ -477,6 +569,113 @@ "text": "$(thing)Відсоток$(): 14%$(br)$(thing)Розплавляється в$(): Кобальту$(br)$(thing)Формула$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Розмір$(): 40$(br)$(thing)Висота$(): 9$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Анортозит, Норит, Фоноліт", + "title": "Гіпс і Кальцит", + "type": "patchouli:text", + "anchor": "moon_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гіпс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Використовується для$(): Алебастрової (фарбованої) цегли$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 25%$(br)$(thing)Джерело$(): Кальцію$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Джерело$(): Натрію, Бору$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Алуніт", + "multiblock": { + "mapping": { + "0": "#forge:ores/alunite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Калію, Алюмінію$(br)$(thing)Формула$(): KAl₃Si₂H₆O₁₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Оливін", + "multiblock": { + "mapping": { + "0": "#forge:ores/olivine" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 5%$(br)$(thing)Джерело$(): Магнію, Залізо$(br)$(thing)Формула$(): Mg₂Fe(SiO₂)₂", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 260$(br)$(thing)Щільність$(): 0.55$(br)$(thing)Тип$(): Трубна вена$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Висота$(): 60$(br)$(thing)Радіус$(): 12$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Базальт, Габро, Фоноліт", @@ -636,6 +835,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 170$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 10 — 80$(br)$(thing)Розмір$(): 40$(br)$(thing)Висота$(): 10$(br)$(thing)Індикатор Max Depth$(): 60$(br2)$(thing)Типи каменю$(): Базальт, Граніт, Діорит", + "title": "Золото і Магнетит", + "type": "patchouli:text", + "anchor": "moon_gold" + }, + { + "Type": "patchouli:multiblock", + "name": "Самородна Золото", + "multiblock": { + "mapping": { + "0": "#forge:ores/gold" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 55%$(br)$(thing)Розплавляється в$(): Золото$(br)$(thing)Формула$(): Au", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Боксит", + "multiblock": { + "mapping": { + "0": "#forge:ores/bauxite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Джерело$(): Алюмінію$(br)$(thing)Формула$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Магнетит", + "multiblock": { + "mapping": { + "0": "#forge:ores/magnetite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Розплавляється в$(): Чавун$(br)$(thing)Формула$(): Fe₃O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Зелений сапфір", + "multiblock": { + "mapping": { + "0": "#forge:ores/green_sapphire" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 5%$(br)$(thing)Джерело$(): Алюмінію$(br)$(thing)Формула$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 230$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Розмір$(): 60$(br)$(thing)Індикатор Max Depth$(): 80$(br2)$(thing)Типи каменю$(): Андезит, Анортозит, Базальт, Габро, Дацит, Діорит, Норит, Ріоліт, Фоноліт", @@ -728,6 +1019,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 210$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 60$(br2)$(thing)Типи каменю$(): Габро, Граніт, Діорит, Норит", + "title": "Каситерит і Халькопірит", + "type": "patchouli:text", + "anchor": "moon_cassiterite" + }, + { + "Type": "patchouli:multiblock", + "name": "Каситерит", + "multiblock": { + "mapping": { + "0": "#forge:ores/cassiterite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 41%$(br)$(thing)Розплавляється в$(): Олово$(br)$(thing)Формула$(): SnO₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Халькопирит", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcopyrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Розплавляється в$(): Мідь$(br)$(thing)Формула$(): CuFeS₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Олово", + "multiblock": { + "mapping": { + "0": "#forge:ores/tin" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 17%$(br)$(thing)Розплавляється в$(): Олово$(br)$(thing)Формула$(): Sn", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Цеоліт", + "multiblock": { + "mapping": { + "0": "#forge:ores/zeolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 5%$(br)$(thing)Джерело$(): Алюмінію, Кисню$(br)$(thing)Формула$(): NaCa₄Si₂₇Al₉(H₂O)₂₈O₇₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Розмір$(): 35$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Габро, Діорит, Норит", @@ -797,10 +1180,10 @@ }, { "Type": "patchouli:multiblock", - "name": "Полюцит", + "name": "Алюмінію", "multiblock": { "mapping": { - "0": "#forge:ores/pollucite" + "0": "#forge:ores/aluminium" }, "pattern": [ [ @@ -812,7 +1195,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 14%$(br)$(thing)Джерело$(): Цезій, Алюмінію$(br)$(thing)Формула$(): Cs₂Al₂Si₄(H₂O)₂O₁₂", + "text": "$(thing)Відсоток$(): 14%$(br)$(thing)Джерело$(): Алюмінію$(br)$(thing)Формула$(): Al", "type": "patchouli:multiblock" }, { @@ -1683,6 +2066,98 @@ "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Заліза, Титану, Азоту$(br)$(thing)Формула$(): (Mg₂Fe(SiO₂)₂)₂(TiO₂)N₄", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 190$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 50 — 128$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 60$(br2)$(thing)Типи каменю$(): Андезит, Дацит, Ріоліт, Фоноліт", + "title": "Тетраедрит і Халькоцит", + "type": "patchouli:text", + "anchor": "moon_tetrahedrite" + }, + { + "Type": "patchouli:multiblock", + "name": "Тетраедрит", + "multiblock": { + "mapping": { + "0": "#forge:ores/tetrahedrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 40%$(br)$(thing)Розплавляється в$(): Мідь$(br)$(thing)Формула$(): Cu₃SbS₃Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Халькоцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcocite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 25%$(br)$(thing)Джерело$(): Міді$(br)$(thing)Формула$(): Cu₂S", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Стибніт", + "multiblock": { + "mapping": { + "0": "#forge:ores/stibnite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Розплавляється в$(): Сурму$(br)$(thing)Формула$(): Sb₂S₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Самородна Мідь", + "multiblock": { + "mapping": { + "0": "#forge:ores/copper" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Розплавляється в$(): Мідь$(br)$(thing)Формула$(): Cu", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 210$(br)$(thing)Щільність$(): 0.5$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Розмір$(): 64$(br)$(thing)Висота$(): 25$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Андезит, Анортозит, Базальт, Габро, Дацит, Діорит, Норит, Ріоліт, Фоноліт", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json index 2521afd64..ed2408ff2 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json @@ -14,42 +14,42 @@ }, { "Type": "patchouli:text", - "text": "$(li)Азбест: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Алмандін: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Аметист: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Антрацит: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Апатит: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Базальтовий мінеральний пісок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Бентоніт: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Берилій: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Борніт: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Ванадієвий магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()", + "text": "$(li)Азбест: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Алмандін: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Аметист: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Антрацит: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Апатит: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Базальтовий мінеральний пісок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Бентоніт: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Берилій: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Борніт: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Вольфрам: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Вугілля: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Галена: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Гематит: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Гетит: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Гіпс: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Гранатовий пісок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Гранітний мінеральний пісок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Діамант: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()", + "text": "$(li)Ванадієвий магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Вольфрам: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Вугілля: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Галена: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Гематит: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Гетит: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Гіпс: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Гранатовий пісок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Гранітний мінеральний пісок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Діатомітн: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Електротин: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Земля Фуллера: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Кальцит: $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Каситерит: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Каситеритові піски: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Кварцит: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Кіновар: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()", + "text": "$(li)Діамант: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Діатомітн: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Електротин: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Земля Фуллера: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Кальцит: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Каситерит: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Каситеритові піски: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Кварцит: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Кобальт: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Лазурит: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Лапіс: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Літій: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Магнезит: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Малахіт: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Молібденіт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Монацит: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Наквадак: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Неодим: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Нікель: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Нітрат калію: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()", + "text": "$(li)Кіновар: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Лазурит: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Лапіс: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Літій: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Магнезит: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Малахіт: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Молібденіт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Монацит: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Наквадак: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Неодим: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Нікель: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Оливін: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Олово: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Опал: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Пірит: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Піроп: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Пірохлор: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Платина: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Плутоній: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Повеліт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Полюцит: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Редстоун: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Рубін: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()", + "text": "$(li)Нітрат калію: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Оливін: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Олово: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Опал: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Пірит: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Піроп: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Пірохлор: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Платина: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Плутоній: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Повеліт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Полюцит: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Редстоун: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Самородна Золото: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Самородна Мідь: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сапфір: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Свинець: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сильвін: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Сірка: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Смарагд: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Соапостон: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Содаліт: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Спесартін: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Стибніт: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()", + "text": "$(li)Рубін: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Самородна Золото: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Самородна Мідь: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сапфір: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Свинець: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сильвін: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Сірка: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Смарагд: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Соапостон: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Содаліт: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Спесартін: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Стибніт: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Танталіт: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Ураніт: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()", + "text": "$(li)Сфалерит: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Танталіт: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Ураніт: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Шелдонітн: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", + "text": "$(li)Шеєліт: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json index e27414b26..2f5c672b0 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnet)Аметист, Опал і Гранат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_anthracite)Антрацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_olivine)Бентоніт та Олівін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Гетит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Гранат і Каситеритові піски$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Золото та Гематит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_cassiterite)Каситерит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Кварц Нижнього Світу$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnet)Аметист, Опал і Гранат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_anthracite)Антрацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_olivine)Бентоніт та Олівін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Гетит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gypsum)Гіпс і Кальцит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Гранат і Каситеритові піски$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Золото та Гематит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_cassiterite)Каситерит$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Лапіс, Лазурит та Содаліт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Мінеральні піски$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Наквадак і Плутоній$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Сильвін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Сірка та Пірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Стеатит, Тальк і Трона$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Кварц Нижнього Світу$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Лапіс, Лазурит та Содаліт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Мінеральні піски$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Наквадак і Плутоній$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Сильвін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Сірка та Пірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Срібло, Гален і Свинець$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Тетраедрит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Ураніт & Пітчбленд$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_magnetite)Хроміт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sheldonite)Шелдоніт і Борніт$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Тетраедрит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Ураніт & Пітчбленд$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_magnetite)Хроміт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sheldonite)Шелдоніт і Борніт$()$()", "type": "patchouli:text" }, { @@ -770,6 +770,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 32 — 128$(br)$(thing)Розмір$(): 40$(br)$(thing)Висота$(): 9$(br2)$(thing)Типи каменю$(): Мігматит, Піроксеніти, Травертин", + "title": "Гіпс і Кальцит", + "type": "patchouli:text", + "anchor": "nether_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гіпс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Використовується для$(): Алебастрової (фарбованої) цегли$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 30%$(br)$(thing)Джерело$(): Кальцію$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Джерело$(): Натрію, Бору$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Земля Фуллера", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Магнезії$(br)$(thing)Формула$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 270$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 24 — 128$(br)$(thing)Розмір$(): 45$(br2)$(thing)Типи каменю$(): Аспідний сланець, Габро, Гнейс, Граніт, Діорит, Мігматит, Піроксеніти, Травертин", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index d999d8baf..6cb99987b 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -686,6 +686,7 @@ "ore_vein.tfg.normal_garnierite": "Garnierite & Cobaltite", "ore_vein.tfg.normal_gold": "Gold, Limonite, & Hematite", "ore_vein.tfg.normal_graphite": "Graphite & Diamond", + "ore_vein.tfg.normal_gypsum": "Gypsum & Calcite", "ore_vein.tfg.normal_hematite": "Hematite & Limonite", "ore_vein.tfg.normal_lapis": "Lapis, Lazurite, & Sodalite", "ore_vein.tfg.normal_limonite": "Limonite", @@ -710,12 +711,17 @@ "ore_vein.tfg.surface_copper": "Chalcopyrite & Realgar", "ore_vein.tfg.surface_sphalerite": "Sphalerite & Sulfur", "ore_vein.tfg.surface_tetrahedrite": "Tetrahedrite (Surface)", + "ore_vein.tfg.mars_hematite": "(Placeholder Vein)", "ore_vein.tfg.moon_apatite": "Apatite & Pyrochlore", "ore_vein.tfg.moon_bauxite": "Bauxite & Ilmenite", "ore_vein.tfg.moon_beryllium": "Emerald & Beryllium", + "ore_vein.tfg.moon_cassiterite": "Cassiterite & Chalcopyrite", "ore_vein.tfg.moon_desh": "Desh & Ilmenite", + "ore_vein.tfg.moon_garnet": "Amethyst, Opal, & Garnet", "ore_vein.tfg.moon_garnierite": "Garnierite & Cobaltite", + "ore_vein.tfg.moon_gold": "Gold & Magnetite", "ore_vein.tfg.moon_graphite": "Graphite & Diamond", + "ore_vein.tfg.moon_gypsum": "Gypsum & Calcite", "ore_vein.tfg.moon_lubricant": "Soapstone, Talc, & Trona", "ore_vein.tfg.moon_magnetite": "Chromite & Magnetite", "ore_vein.tfg.moon_manganese": "Manganese & Tantalum", @@ -731,6 +737,7 @@ "ore_vein.tfg.moon_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.moon_silver": "Silver, Galena, & Lead", "ore_vein.tfg.moon_sphalerite": "Sphalerite & Pyrite", + "ore_vein.tfg.moon_tetrahedrite": "Tetrahedrite & Chalcocite", "ore_vein.tfg.moon_topaz": "Topaz & Chalcocite", "ore_vein.tfg.nether_anthracite": "Anthracite", "ore_vein.tfg.nether_apatite": "Apatite & Pyrochlore", @@ -744,6 +751,7 @@ "ore_vein.tfg.nether_goethite": "Goethite", "ore_vein.tfg.nether_gold": "Gold & Hematite", "ore_vein.tfg.nether_graphite": "Graphite & Diamond", + "ore_vein.tfg.nether_gypsum": "Gypsum & Calcite", "ore_vein.tfg.nether_hematite": "Hematite & Limonite", "ore_vein.tfg.nether_lapis": "Lapis, Lazurite, & Sodalite", "ore_vein.tfg.nether_lubricant": "Soapstone, Talc, & Trona", diff --git a/kubejs/assets/tfg/lang/pt_br.json b/kubejs/assets/tfg/lang/pt_br.json index 7cfc20e32..786ba4dc3 100644 --- a/kubejs/assets/tfg/lang/pt_br.json +++ b/kubejs/assets/tfg/lang/pt_br.json @@ -326,6 +326,7 @@ "ore_vein.tfg.normal_garnierite": "Garnierita e Cobaltita", "ore_vein.tfg.normal_gold": "Ouro, Limonita e Hematita", "ore_vein.tfg.normal_graphite": "Grafite e Diamante", + "ore_vein.tfg.normal_gypsum": "Gipsita e Calcita", "ore_vein.tfg.normal_hematite": "Hematita e Limonita", "ore_vein.tfg.normal_lapis": "Lápis-lazúri, Lazurita e Sodalita", "ore_vein.tfg.normal_limonite": "Limonita", @@ -350,12 +351,17 @@ "ore_vein.tfg.surface_copper": "Calcopirita e Realgar", "ore_vein.tfg.surface_sphalerite": "Esfalerita e Enxofre", "ore_vein.tfg.surface_tetrahedrite": "Tetraedrita (Superfície)", + "ore_vein.tfg.mars_hematite": "(Placeholder Vein)", "ore_vein.tfg.moon_apatite": "Apatita e Pirocloro", "ore_vein.tfg.moon_bauxite": "Bauxita e Ilmenita", "ore_vein.tfg.moon_beryllium": "Esmeralda e Berílio", + "ore_vein.tfg.moon_cassiterite": "Cassiterita e Calcopirita", "ore_vein.tfg.moon_desh": "Desh e Ilmenita", + "ore_vein.tfg.moon_garnet": "Ametista, Opala e Granada", "ore_vein.tfg.moon_garnierite": "Garnierita e Cobaltita", + "ore_vein.tfg.moon_gold": "Ouro e Magnetita", "ore_vein.tfg.moon_graphite": "Grafite e Diamante", + "ore_vein.tfg.moon_gypsum": "Gipsita e Calcita", "ore_vein.tfg.moon_lubricant": "Pedra-sabão, Talco e Trona", "ore_vein.tfg.moon_magnetite": "Cromita e Magnetita", "ore_vein.tfg.moon_manganese": "Manganês e Tântalo", @@ -371,6 +377,7 @@ "ore_vein.tfg.moon_sheldonite": "Cooperita e Bornita", "ore_vein.tfg.moon_silver": "Prata, Galena e Chumbo", "ore_vein.tfg.moon_sphalerite": "Esfalerita e Pirita", + "ore_vein.tfg.moon_tetrahedrite": "Tetraedrita e Calcocita", "ore_vein.tfg.moon_topaz": "Topázio e Calcosita", "ore_vein.tfg.nether_anthracite": "Antracito", "ore_vein.tfg.nether_apatite": "Apatita e Pirocloro", @@ -384,6 +391,7 @@ "ore_vein.tfg.nether_goethite": "Goethita", "ore_vein.tfg.nether_gold": "Ouro e Hematita", "ore_vein.tfg.nether_graphite": "Grafite e Diamante", + "ore_vein.tfg.nether_gypsum": "Gipsita e Calcita", "ore_vein.tfg.nether_hematite": "Hematita e Limonita", "ore_vein.tfg.nether_lapis": "Lápis-lazúri, Lazurita e Sodalita", "ore_vein.tfg.nether_lubricant": "Pedra-sabão, Talco e Trona", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index bbd6f8230..612e31d9f 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -134,6 +134,7 @@ "ore_vein.tfg.normal_garnierite": "Гарниерит и Кобальтит", "ore_vein.tfg.normal_gold": "Золото, Лимонит и Гематит", "ore_vein.tfg.normal_graphite": "Графит и Алмаз", + "ore_vein.tfg.normal_gypsum": "Гипс и Кальцит", "ore_vein.tfg.normal_hematite": "Гематит и Лимонит", "ore_vein.tfg.normal_lapis": "Лазурит, Лазурит 2 и Содалит", "ore_vein.tfg.normal_limonite": "Лимонит", @@ -158,12 +159,17 @@ "ore_vein.tfg.surface_copper": "Халькопирит и Реальгар", "ore_vein.tfg.surface_sphalerite": "Сфалерит и Сера", "ore_vein.tfg.surface_tetrahedrite": "Тетраэдрит (Поверхностный)", + "ore_vein.tfg.mars_hematite": "(Placeholder Vein)", "ore_vein.tfg.moon_apatite": "Апатит и Пирохлор", "ore_vein.tfg.moon_bauxite": "Боксит и Ильменит", "ore_vein.tfg.moon_beryllium": "Изумруд и Бериллий", + "ore_vein.tfg.moon_cassiterite": "Касситерит и Халькопирит", "ore_vein.tfg.moon_desh": "Desh & Ilmenite", + "ore_vein.tfg.moon_garnet": "Аметист, Опал и гранат", "ore_vein.tfg.moon_garnierite": "Гарниерит и Кобальтит", + "ore_vein.tfg.moon_gold": "Золото и Магнетит", "ore_vein.tfg.moon_graphite": "Графит и Алмаз", + "ore_vein.tfg.moon_gypsum": "Гипс и Кальцит", "ore_vein.tfg.moon_lubricant": "Мыльный камень, Тальк и Трона", "ore_vein.tfg.moon_magnetite": "Хромит и Магнетит", "ore_vein.tfg.moon_manganese": "Марганец и Тантал", @@ -179,6 +185,7 @@ "ore_vein.tfg.moon_sheldonite": "Шелдонит и Борнит", "ore_vein.tfg.moon_silver": "Серебро, Галена и Свинец", "ore_vein.tfg.moon_sphalerite": "Сфалерит & Пирит", + "ore_vein.tfg.moon_tetrahedrite": "Тетраэдрит и Халькозин", "ore_vein.tfg.moon_topaz": "Топаз и Халькозин", "ore_vein.tfg.nether_anthracite": "Антрацит", "ore_vein.tfg.nether_apatite": "Апатит и Пирохлор", @@ -192,6 +199,7 @@ "ore_vein.tfg.nether_goethite": "Гётит", "ore_vein.tfg.nether_gold": "Золото и Гематит", "ore_vein.tfg.nether_graphite": "Графит и Алмаз", + "ore_vein.tfg.nether_gypsum": "Гипс и Кальцит", "ore_vein.tfg.nether_hematite": "Гематит и Лимонит", "ore_vein.tfg.nether_lapis": "Лазурит, Лазурит 2 и Содалит", "ore_vein.tfg.nether_lubricant": "Мыльный камень, Тальк и Трона", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 2c29801b2..cfb3c8cda 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -668,23 +668,24 @@ "ore_vein.tfg.deep_pitchblende": "Ураніт & Пітчбленд", "ore_vein.tfg.deep_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.deep_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.deep_sheldonite": "Куперит і Борніт", + "ore_vein.tfg.deep_sheldonite": "Шелдоніт і Борніт", "ore_vein.tfg.deep_topaz": "Топаз і Халькоцит", "ore_vein.tfg.normal_apatite": "Апатит і Пірохлор", "ore_vein.tfg.normal_basaltic_sands": "Мінеральні піски", "ore_vein.tfg.normal_beryllium": "Смарагд і Берилій", - "ore_vein.tfg.normal_bismuthinite": "Бісмут (Звичайний)", - "ore_vein.tfg.normal_cassiterite": "Каситерит (звичайний)", + "ore_vein.tfg.normal_bismuthinite": "Вісмут (Звичайний)", + "ore_vein.tfg.normal_cassiterite": "Каситерит (Звичайний)", "ore_vein.tfg.normal_coal": "Вугілля", "ore_vein.tfg.normal_copper": "Мідь та Халькопірит", "ore_vein.tfg.normal_garnet_tin": "Гранат і Каситеритові піски", "ore_vein.tfg.normal_garnierite": "Гарнієрит і Кобальтит", "ore_vein.tfg.normal_gold": "Золото, Лімоніт та Гематит", "ore_vein.tfg.normal_graphite": "Графіт і Діамант", + "ore_vein.tfg.normal_gypsum": "Гіпс і Кальцит", "ore_vein.tfg.normal_hematite": "Гематит та Лімоніт", "ore_vein.tfg.normal_lapis": "Лапіс, Лазурит та Содаліт", "ore_vein.tfg.normal_limonite": "Лімоніт", - "ore_vein.tfg.normal_lubricant": "Соапостон, Тальк і Трона", + "ore_vein.tfg.normal_lubricant": "Стеатит, Тальк і Трона", "ore_vein.tfg.normal_magnetite": "Магнетит і Ванадій", "ore_vein.tfg.normal_manganese": "Марганець і Тантал", "ore_vein.tfg.normal_mica": "Кіаніт, Слюда та Боксити", @@ -700,62 +701,69 @@ "ore_vein.tfg.normal_spodumene": "Сподумен та Лепідоліт", "ore_vein.tfg.normal_sulfur": "Сірка та Пірит", "ore_vein.tfg.normal_tetrahedrite": "Тетраедрит (Звичайний)", - "ore_vein.tfg.surface_bismuthinite": "Вісмут (Поверхневий)", - "ore_vein.tfg.surface_cassiterite": "Каситерит (Поверхневий)", + "ore_vein.tfg.surface_bismuthinite": "Вісмут (Поверхня)", + "ore_vein.tfg.surface_cassiterite": "Каситерит (Поверхнивий)", "ore_vein.tfg.surface_copper": "Халькопірит та Реальгар", "ore_vein.tfg.surface_sphalerite": "Сфалерит і Сірка", - "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхневий)", + "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхня)", + "ore_vein.tfg.mars_hematite": "(Placeholder Vein)", "ore_vein.tfg.moon_apatite": "Апатит і Пірохлор", "ore_vein.tfg.moon_bauxite": "Боксит і Ільменіт", "ore_vein.tfg.moon_beryllium": "Смарагд і Берилій", + "ore_vein.tfg.moon_cassiterite": "Каситерит і Халькопірит", "ore_vein.tfg.moon_desh": "Деш і Ільменіт", + "ore_vein.tfg.moon_garnet": "Аметист, Опал і Гранат", "ore_vein.tfg.moon_garnierite": "Гарнієрит і Кобальтит", + "ore_vein.tfg.moon_gold": "Золото і Магнетит", "ore_vein.tfg.moon_graphite": "Графіт і Діамант", - "ore_vein.tfg.moon_lubricant": "Соапостон, Тальк і Трона", + "ore_vein.tfg.moon_gypsum": "Гіпс і Кальцит", + "ore_vein.tfg.moon_lubricant": "Стеатит, Тальк і Трона", "ore_vein.tfg.moon_magnetite": "Хроміт і Магнетит", "ore_vein.tfg.moon_manganese": "Марганець і Тантал", "ore_vein.tfg.moon_mica": "Кіаніт, Слюда та Боксити", "ore_vein.tfg.moon_molybdenum": "Вульфеніт і Молібденіт", "ore_vein.tfg.moon_monazite": "Бастнезит і Монацит", "ore_vein.tfg.moon_pyrolusite": "Піролюзит і Кобальт", - "ore_vein.tfg.moon_quartz": "Істинний кварц", + "ore_vein.tfg.moon_quartz": "Істинний Кварц", "ore_vein.tfg.moon_redstone": "Редстоун, Кіновар і Рубін", "ore_vein.tfg.moon_saltpeter": "Селітра та Електротин", "ore_vein.tfg.moon_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.moon_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.moon_sheldonite": "Куперит і Борніт", + "ore_vein.tfg.moon_sheldonite": "Шелдоніт і Борніт", "ore_vein.tfg.moon_silver": "Срібло, Гален і Свинець", "ore_vein.tfg.moon_sphalerite": "Сфалерит і Пірит", + "ore_vein.tfg.moon_tetrahedrite": "Тетраедрит і Халькоцит", "ore_vein.tfg.moon_topaz": "Топаз і Халькоцит", "ore_vein.tfg.nether_anthracite": "Антрацит", "ore_vein.tfg.nether_apatite": "Апатит і Пірохлор", "ore_vein.tfg.nether_basaltic_sands": "Мінеральні піски", "ore_vein.tfg.nether_beryllium": "Смарагд і Берилій", - "ore_vein.tfg.nether_cassiterite": "Касетерит", + "ore_vein.tfg.nether_cassiterite": "Каситерит", "ore_vein.tfg.nether_copper": "Мідь та Халькопірит", "ore_vein.tfg.nether_garnet": "Аметист, Опал і Гранат", "ore_vein.tfg.nether_garnet_tin": "Гранат і Каситеритові піски", "ore_vein.tfg.nether_garnierite": "Гарнієрит і Кобальтит", "ore_vein.tfg.nether_goethite": "Гетит", - "ore_vein.tfg.nether_gold": "Золото і Гематит", + "ore_vein.tfg.nether_gold": "Золото та Гематит", "ore_vein.tfg.nether_graphite": "Графіт і Діамант", + "ore_vein.tfg.nether_gypsum": "Гіпс і Кальцит", "ore_vein.tfg.nether_hematite": "Гематит та Лімоніт", "ore_vein.tfg.nether_lapis": "Лапіс, Лазурит та Содаліт", - "ore_vein.tfg.nether_lubricant": "Соапостон, Тальк і Трона", + "ore_vein.tfg.nether_lubricant": "Стеатит, Тальк і Трона", "ore_vein.tfg.nether_magnetite": "Хроміт", "ore_vein.tfg.nether_manganese": "Марганець і Тантал", "ore_vein.tfg.nether_mica": "Кіаніт, Слюда та Боксити", "ore_vein.tfg.nether_molybdenum": "Вульфеніт і Молібденіт", "ore_vein.tfg.nether_monazite": "Бастнезит і Монацит", - "ore_vein.tfg.nether_naquadah": "Наквада і Плутоній", + "ore_vein.tfg.nether_naquadah": "Наквадак і Плутоній", "ore_vein.tfg.nether_olivine": "Бентоніт та Олівін", "ore_vein.tfg.nether_pitchblende": "Ураніт & Пітчбленд", - "ore_vein.tfg.nether_quartz": "Незерський кварц", + "ore_vein.tfg.nether_quartz": "Кварц Нижнього Світу", "ore_vein.tfg.nether_redstone": "Редстоун, Кіновар і Рубін", "ore_vein.tfg.nether_saltpeter": "Селітра та Електротин", "ore_vein.tfg.nether_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.nether_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.nether_sheldonite": "Куперит і Борніт", + "ore_vein.tfg.nether_sheldonite": "Шелдоніт і Борніт", "ore_vein.tfg.nether_silver": "Срібло, Гален і Свинець", "ore_vein.tfg.nether_sphalerite": "Сфалерит і Пірит", "ore_vein.tfg.nether_sulfur": "Сірка та Пірит", diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_garnet_opal.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_garnet_opal.json index 2e91fad6c..3d4d8f5b8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_garnet_opal.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_garnet_opal.json @@ -47,8 +47,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_gold.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_gold.json index 24d21b7ae..ec13a657d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_gold.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_gold.json @@ -42,8 +42,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_hematite.json index dbbcb2f17..f173f7850 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_hematite.json @@ -50,8 +50,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_molybdenum.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_molybdenum.json index dd06853dd..aad5cabf3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_molybdenum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_molybdenum.json @@ -38,8 +38,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_sapphire.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_sapphire.json index 31bfc9eb2..1e8917ce4 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_sapphire.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_sapphire.json @@ -43,8 +43,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_basaltic_sands.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_basaltic_sands.json index b5cc3d0bd..9e61f6ca7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_basaltic_sands.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_basaltic_sands.json @@ -35,8 +35,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json index 1f76cc062..645616ae0 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json @@ -36,8 +36,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_copper.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_copper.json index 7d27df5ef..91bd65cf9 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_copper.json @@ -38,8 +38,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_garnet_tin.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_garnet_tin.json index f8a3b27d5..f5c7da369 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_garnet_tin.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_garnet_tin.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gold.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gold.json index dace25d0e..220a19c23 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gold.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gold.json @@ -39,8 +39,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json index 6b74d783e..bd03ebf27 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json @@ -240,8 +240,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gypsum.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gypsum.json new file mode 100644 index 000000000..3d7ec74c7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gypsum.json @@ -0,0 +1,200 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 9, + "size": 40, + "rarity": 180, + "density": 0.3, + "min_y": -32, + "max_y": 60, + "random_name": "normal_gypsum", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/shale" + ], + "with": [ + { + "block": "gtceu:shale_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:shale_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:shale_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:shale_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/claystone" + ], + "with": [ + { + "block": "gtceu:claystone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:claystone_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:claystone_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:claystone_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/limestone" + ], + "with": [ + { + "block": "gtceu:limestone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:limestone_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:limestone_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:limestone_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/conglomerate" + ], + "with": [ + { + "block": "gtceu:conglomerate_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:conglomerate_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:conglomerate_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:conglomerate_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dolomite" + ], + "with": [ + { + "block": "gtceu:dolomite_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:dolomite_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:dolomite_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:dolomite_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chert" + ], + "with": [ + { + "block": "gtceu:chert_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:chert_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:chert_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:chert_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chalk" + ], + "with": [ + { + "block": "gtceu:chalk_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:chalk_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:chalk_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:chalk_gypsum_ore", + "weight": 35 + } + ] + } + ], + "indicator": { + "rarity": 15, + "depth": 20, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:borax_indicator", + "weight": 20 + }, + { + "block": "gtceu:calcite_indicator", + "weight": 30 + }, + { + "block": "gtceu:fullers_earth_indicator", + "weight": 15 + }, + { + "block": "gtceu:gypsum_indicator", + "weight": 35 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_hematite.json index 492ec069d..59cc1a505 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_hematite.json @@ -38,8 +38,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_manganese.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_manganese.json index 396c0301b..608ce5b8f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_manganese.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_manganese.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_olivine.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_olivine.json index 98d8a9584..ef1b2720e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_olivine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_olivine.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sphalerite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sphalerite.json index 81af3111e..ddc49afb4 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sphalerite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sphalerite.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sulfur.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sulfur.json index 8f99aadaa..7b71c24ca 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sulfur.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sulfur.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_copper.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_copper.json index f66f372cf..1e3d56b6b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_copper.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_sphalerite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_sphalerite.json index a1d76e307..729a85601 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_sphalerite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_sphalerite.json @@ -30,8 +30,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json new file mode 100644 index 000000000..9caaf4d83 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json @@ -0,0 +1,252 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:cluster_vein", + "config": { + "size": 40, + "rarity": 210, + "density": 0.4, + "min_y": -16, + "max_y": 100, + "random_name": "mars_hematite", + "blocks": [ + { + "replace": [ + "ad_astra:mars_stone" + ], + "with": [ + { + "block": "gtceu:mars_stone_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "ad_astra:venus_stone" + ], + "with": [ + { + "block": "gtceu:venus_stone_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "gtceu:red_granite" + ], + "with": [ + { + "block": "gtceu:red_granite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/granite" + ], + "with": [ + { + "block": "gtceu:granite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "block": "gtceu:diorite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gabbro" + ], + "with": [ + { + "block": "gtceu:gabbro_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/shale" + ], + "with": [ + { + "block": "gtceu:shale_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/claystone" + ], + "with": [ + { + "block": "gtceu:claystone_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/limestone" + ], + "with": [ + { + "block": "gtceu:limestone_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/conglomerate" + ], + "with": [ + { + "block": "gtceu:conglomerate_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dolomite" + ], + "with": [ + { + "block": "gtceu:dolomite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chert" + ], + "with": [ + { + "block": "gtceu:chert_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chalk" + ], + "with": [ + { + "block": "gtceu:chalk_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/basalt", + "minecraft:basalt" + ], + "with": [ + { + "block": "gtceu:basalt_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dacite" + ], + "with": [ + { + "block": "gtceu:dacite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + } + ], + "indicator": { + "rarity": 12, + "depth": 50, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "tfc:ore/small_hematite", + "weight": 100 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json index df5055889..19f60ccaa 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json @@ -11,18 +11,26 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { "block": "gtceu:basalt_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:basalt_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:basalt_armalcolite_ore", "weight": 20 @@ -38,10 +46,18 @@ "block": "gtceu:moon_stone_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:moon_stone_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:moon_stone_armalcolite_ore", "weight": 20 @@ -57,10 +73,18 @@ "block": "gtceu:moon_deepslate_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:moon_deepslate_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:moon_deepslate_armalcolite_ore", "weight": 20 @@ -76,10 +100,18 @@ "block": "gtceu:glacio_stone_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:glacio_stone_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:glacio_stone_armalcolite_ore", "weight": 20 @@ -95,10 +127,18 @@ "block": "gtceu:diorite_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:diorite_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:diorite_armalcolite_ore", "weight": 20 @@ -114,10 +154,18 @@ "block": "gtceu:rhyolite_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:rhyolite_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:rhyolite_armalcolite_ore", "weight": 20 diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json index fa207b3ba..97a0a2192 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json @@ -17,8 +17,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_cassiterite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_cassiterite.json new file mode 100644 index 000000000..7fe3826ca --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_cassiterite.json @@ -0,0 +1,158 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:cluster_vein", + "config": { + "size": 40, + "rarity": 210, + "density": 0.3, + "min_y": 10, + "max_y": 128, + "random_name": "moon_cassiterite", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/granite" + ], + "with": [ + { + "block": "gtceu:granite_chalcopyrite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_chalcopyrite_block", + "weight": 1 + }, + { + "block": "gtceu:granite_zeolite_ore", + "weight": 5 + }, + { + "block": "gtceu:granite_cassiterite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_cassiterite_block", + "weight": 1 + }, + { + "block": "gtceu:granite_tin_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "block": "gtceu:diorite_chalcopyrite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_chalcopyrite_block", + "weight": 1 + }, + { + "block": "gtceu:diorite_zeolite_ore", + "weight": 5 + }, + { + "block": "gtceu:diorite_cassiterite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_cassiterite_block", + "weight": 1 + }, + { + "block": "gtceu:diorite_tin_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gabbro" + ], + "with": [ + { + "block": "gtceu:gabbro_chalcopyrite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_chalcopyrite_block", + "weight": 1 + }, + { + "block": "gtceu:gabbro_zeolite_ore", + "weight": 5 + }, + { + "block": "gtceu:gabbro_cassiterite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_cassiterite_block", + "weight": 1 + }, + { + "block": "gtceu:gabbro_tin_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "ad_astra:moon_deepslate" + ], + "with": [ + { + "block": "gtceu:moon_deepslate_chalcopyrite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_chalcopyrite_block", + "weight": 1 + }, + { + "block": "gtceu:moon_deepslate_zeolite_ore", + "weight": 5 + }, + { + "block": "gtceu:moon_deepslate_cassiterite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_cassiterite_block", + "weight": 1 + }, + { + "block": "gtceu:moon_deepslate_tin_ore", + "weight": 15 + } + ] + } + ], + "indicator": { + "rarity": 12, + "depth": 60, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "tfc:ore/small_cassiterite", + "weight": 50 + }, + { + "block": "gtceu:zeolite_indicator", + "weight": 5 + }, + { + "block": "gtceu:chalcopyrite_indicator", + "weight": 30 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json index 65ce7f852..07f6d4ca7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json @@ -104,8 +104,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_garnet.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_garnet.json new file mode 100644 index 000000000..3e8c7c63b --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_garnet.json @@ -0,0 +1,133 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 7, + "size": 35, + "rarity": 230, + "density": 0.35, + "min_y": 10, + "max_y": 128, + "random_name": "moon_garnet", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/rhyolite" + ], + "with": [ + { + "block": "gtceu:rhyolite_red_garnet_ore", + "weight": 10 + }, + { + "block": "gtceu:rhyolite_yellow_garnet_ore", + "weight": 15 + }, + { + "block": "gtceu:rhyolite_amethyst_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_amethyst_block", + "weight": 1 + }, + { + "block": "gtceu:rhyolite_opal_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_opal_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/basalt", + "minecraft:basalt" + ], + "with": [ + { + "block": "gtceu:basalt_red_garnet_ore", + "weight": 10 + }, + { + "block": "gtceu:basalt_yellow_garnet_ore", + "weight": 15 + }, + { + "block": "gtceu:basalt_amethyst_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_amethyst_block", + "weight": 1 + }, + { + "block": "gtceu:basalt_opal_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_opal_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/andesite" + ], + "with": [ + { + "block": "gtceu:andesite_red_garnet_ore", + "weight": 10 + }, + { + "block": "gtceu:andesite_yellow_garnet_ore", + "weight": 15 + }, + { + "block": "gtceu:andesite_amethyst_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_amethyst_block", + "weight": 1 + }, + { + "block": "gtceu:andesite_opal_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_opal_block", + "weight": 1 + } + ] + } + ], + "indicator": { + "rarity": 15, + "depth": 20, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:red_garnet_bud_indicator", + "weight": 10 + }, + { + "block": "gtceu:yellow_garnet_bud_indicator", + "weight": 15 + }, + { + "block": "gtceu:amethyst_bud_indicator", + "weight": 40 + }, + { + "block": "gtceu:opal_bud_indicator", + "weight": 40 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gold.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gold.json new file mode 100644 index 000000000..0bfffb9a6 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gold.json @@ -0,0 +1,121 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 10, + "size": 40, + "rarity": 170, + "density": 0.4, + "min_y": 10, + "max_y": 80, + "random_name": "moon_gold", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/basalt", + "minecraft:basalt" + ], + "with": [ + { + "block": "gtceu:basalt_green_sapphire_ore", + "weight": 5 + }, + { + "block": "gtceu:basalt_bauxite_ore", + "weight": 20 + }, + { + "block": "gtceu:basalt_magnetite_ore", + "weight": 20 + }, + { + "block": "gtceu:basalt_gold_ore", + "weight": 55 + }, + { + "block": "minecraft:raw_gold_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/granite" + ], + "with": [ + { + "block": "gtceu:granite_green_sapphire_ore", + "weight": 5 + }, + { + "block": "gtceu:granite_bauxite_ore", + "weight": 20 + }, + { + "block": "gtceu:granite_magnetite_ore", + "weight": 20 + }, + { + "block": "gtceu:granite_gold_ore", + "weight": 55 + }, + { + "block": "minecraft:raw_gold_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "block": "gtceu:diorite_green_sapphire_ore", + "weight": 5 + }, + { + "block": "gtceu:diorite_bauxite_ore", + "weight": 20 + }, + { + "block": "gtceu:diorite_magnetite_ore", + "weight": 20 + }, + { + "block": "gtceu:diorite_gold_ore", + "weight": 55 + }, + { + "block": "minecraft:raw_gold_block", + "weight": 1 + } + ] + } + ], + "indicator": { + "rarity": 12, + "depth": 60, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:green_sapphire_bud_indicator", + "weight": 5 + }, + { + "block": "gtceu:bauxite_indicator", + "weight": 20 + }, + { + "block": "tfc:ore/small_magnetite", + "weight": 20 + }, + { + "block": "tfc:ore/small_native_gold", + "weight": 55 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_graphite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_graphite.json index fa3ab8267..a971dfefb 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_graphite.json @@ -17,8 +17,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { @@ -110,8 +110,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gypsum.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gypsum.json new file mode 100644 index 000000000..bad9a40c4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gypsum.json @@ -0,0 +1,136 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 9, + "size": 40, + "rarity": 180, + "density": 0.3, + "min_y": 10, + "max_y": 100, + "random_name": "moon_gypsum", + "blocks": [ + { + "replace": [ + "ad_astra:moon_stone" + ], + "with": [ + { + "block": "gtceu:moon_stone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:moon_stone_calcite_ore", + "weight": 25 + }, + { + "block": "gtceu:moon_stone_alunite_ore", + "weight": 15 + }, + { + "block": "gtceu:moon_stone_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + }, + { + "block": "gtceu:moon_stone_olivine_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "ad_astra:glacio_stone" + ], + "with": [ + { + "block": "gtceu:glacio_stone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:glacio_stone_calcite_ore", + "weight": 25 + }, + { + "block": "gtceu:glacio_stone_alunite_ore", + "weight": 15 + }, + { + "block": "gtceu:glacio_stone_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + }, + { + "block": "gtceu:glacio_stone_olivine_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "ad_astra:moon_deepslate" + ], + "with": [ + { + "block": "gtceu:moon_deepslate_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:moon_deepslate_calcite_ore", + "weight": 25 + }, + { + "block": "gtceu:moon_deepslate_alunite_ore", + "weight": 15 + }, + { + "block": "gtceu:moon_deepslate_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + }, + { + "block": "gtceu:moon_deepslate_olivine_ore", + "weight": 5 + } + ] + } + ], + "indicator": { + "rarity": 15, + "depth": 20, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:borax_indicator", + "weight": 20 + }, + { + "block": "gtceu:calcite_indicator", + "weight": 25 + }, + { + "block": "gtceu:alunite_indicator", + "weight": 15 + }, + { + "block": "gtceu:gypsum_indicator", + "weight": 35 + }, + { + "block": "gtceu:olivine_bud_indicator", + "weight": 5 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_lubricant.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_lubricant.json index 22be29ee3..4e29c67f3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_lubricant.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_lubricant.json @@ -119,8 +119,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_manganese.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_manganese.json index 33d12a989..3f73c02b9 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_manganese.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_manganese.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { @@ -104,8 +104,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json index 93e8e6043..8cc248a86 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json @@ -31,7 +31,7 @@ "weight": 25 }, { - "block": "gtceu:diorite_pollucite_ore", + "block": "gtceu:diorite_aluminium_ore", "weight": 15 }, { @@ -62,7 +62,7 @@ "weight": 25 }, { - "block": "gtceu:gabbro_pollucite_ore", + "block": "gtceu:gabbro_aluminium_ore", "weight": 15 }, { @@ -93,7 +93,7 @@ "weight": 25 }, { - "block": "gtceu:moon_stone_pollucite_ore", + "block": "gtceu:moon_stone_aluminium_ore", "weight": 15 }, { @@ -124,7 +124,7 @@ "weight": 25 }, { - "block": "gtceu:moon_deepslate_pollucite_ore", + "block": "gtceu:moon_deepslate_aluminium_ore", "weight": 15 }, { @@ -153,7 +153,7 @@ "weight": 25 }, { - "block": "gtceu:pollucite_indicator", + "block": "gtceu:aluminium_indicator", "weight": 15 }, { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json index cd9cd5282..064d537e8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json @@ -11,8 +11,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_pyrolusite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_pyrolusite.json index 6d53962ff..e9f14a9aa 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_pyrolusite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_pyrolusite.json @@ -38,8 +38,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json index 833754174..3ecb7b7bf 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json @@ -11,8 +11,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json index 137fc6888..ccdf61301 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json @@ -12,8 +12,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json index de8075c4e..afdba374b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json @@ -11,8 +11,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sphalerite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sphalerite.json index 6919f3e71..f07416a4c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sphalerite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sphalerite.json @@ -11,8 +11,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_tetrahedrite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_tetrahedrite.json new file mode 100644 index 000000000..1be920439 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_tetrahedrite.json @@ -0,0 +1,146 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:cluster_vein", + "config": { + "size": 40, + "rarity": 190, + "density": 0.3, + "min_y": 50, + "max_y": 128, + "random_name": "moon_tetrahedrite", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/dacite" + ], + "with": [ + { + "block": "gtceu:dacite_tetrahedrite_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:dacite_copper_ore", + "weight": 15 + }, + { + "block": "gtceu:dacite_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:dacite_chalcocite_ore", + "weight": 25 + } + ] + }, + { + "replace": [ + "ad_astra:glacio_stone" + ], + "with": [ + { + "block": "gtceu:glacio_stone_tetrahedrite_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:glacio_stone_copper_ore", + "weight": 15 + }, + { + "block": "gtceu:glacio_stone_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:glacio_stone_chalcocite_ore", + "weight": 25 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/andesite" + ], + "with": [ + { + "block": "gtceu:andesite_tetrahedrite_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:andesite_copper_ore", + "weight": 15 + }, + { + "block": "gtceu:andesite_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:andesite_chalcocite_ore", + "weight": 25 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/rhyolite" + ], + "with": [ + { + "block": "gtceu:rhyolite_tetrahedrite_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:rhyolite_copper_ore", + "weight": 15 + }, + { + "block": "gtceu:rhyolite_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:rhyolite_chalcocite_ore", + "weight": 25 + } + ] + } + ], + "indicator": { + "rarity": 12, + "depth": 60, + "underground_rarity": 1, + "underground_count": 1, + "blocks": [ + { + "block": "tfc:ore/small_tetrahedrite", + "weight": 40 + }, + { + "block": "tfc:ore/small_native_copper", + "weight": 15 + }, + { + "block": "gtceu:stibnite_indicator", + "weight": 20 + }, + { + "block": "gtceu:chalcocite_indicator", + "weight": 25 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_topaz.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_topaz.json index d399fb653..56fe0531a 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_topaz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_topaz.json @@ -12,8 +12,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_basaltic_sands.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_basaltic_sands.json index 09470d9cf..cccbd7c71 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_basaltic_sands.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_basaltic_sands.json @@ -47,8 +47,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json index 25cd317b0..80c57d36c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json @@ -86,8 +86,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_copper.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_copper.json index d6975cd48..de500d4d1 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_copper.json @@ -88,8 +88,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_garnet.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_garnet.json index 0dbc417eb..cdb99b60b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_garnet.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_garnet.json @@ -97,8 +97,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_goethite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_goethite.json index da563d976..3558dc62a 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_goethite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_goethite.json @@ -96,8 +96,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_gypsum.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_gypsum.json new file mode 100644 index 000000000..bba1bc626 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_gypsum.json @@ -0,0 +1,151 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 9, + "size": 40, + "rarity": 180, + "density": 0.4, + "min_y": 32, + "max_y": 128, + "random_name": "nether_gypsum", + "blocks": [ + { + "replace": [ + "minecraft:deepslate", + "tfc:mud/silty_loam", + "beneath:soul_clay", + "tfc:dirt/loam", + "tfc:mud/loam", + "tfc:peat", + "tfc:dirt/silty_loam" + ], + "with": [ + { + "block": "gtceu:deepslate_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:raw_borax_block", + "weight": 1 + }, + { + "block": "gtceu:deepslate_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_calcite_block", + "weight": 1 + }, + { + "block": "gtceu:deepslate_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:deepslate_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "minecraft:dripstone_block" + ], + "with": [ + { + "block": "gtceu:dripstone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:raw_borax_block", + "weight": 1 + }, + { + "block": "gtceu:dripstone_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_calcite_block", + "weight": 1 + }, + { + "block": "gtceu:dripstone_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:dripstone_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "minecraft:blackstone", + "minecraft:magma_block" + ], + "with": [ + { + "block": "gtceu:pyroxenite_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:raw_borax_block", + "weight": 1 + }, + { + "block": "gtceu:pyroxenite_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_calcite_block", + "weight": 1 + }, + { + "block": "gtceu:pyroxenite_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:pyroxenite_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + } + ] + } + ], + "indicator": { + "rarity": 15, + "depth": 1, + "underground_rarity": 40, + "underground_count": 150, + "blocks": [ + { + "block": "gtceu:borax_indicator", + "weight": 20 + }, + { + "block": "gtceu:calcite_indicator", + "weight": 30 + }, + { + "block": "gtceu:fullers_earth_indicator", + "weight": 15 + }, + { + "block": "gtceu:gypsum_indicator", + "weight": 35 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_hematite.json index 48b653d6c..0a9d6d30c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_hematite.json @@ -96,8 +96,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_magnetite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_magnetite.json index 0f02e4e67..0a0c8309e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_magnetite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_magnetite.json @@ -88,8 +88,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_manganese.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_manganese.json index b1122ee7d..3143155bd 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_manganese.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_manganese.json @@ -52,8 +52,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_naquadah.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_naquadah.json index 4f59be363..b29158861 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_naquadah.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_naquadah.json @@ -35,8 +35,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_olivine.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_olivine.json index 5662185ca..dee894d86 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_olivine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_olivine.json @@ -52,8 +52,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_quartz.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_quartz.json index 5b618a691..9405766c9 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_quartz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_quartz.json @@ -72,8 +72,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sheldonite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sheldonite.json index 5480ee655..d47865f85 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sheldonite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sheldonite.json @@ -88,8 +88,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sphalerite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sphalerite.json index 974dba7fa..b363c5829 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sphalerite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sphalerite.json @@ -48,8 +48,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sulfur.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sulfur.json index b6e10b202..ef7aba206 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sulfur.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sulfur.json @@ -42,8 +42,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_topaz.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_topaz.json index 64607724c..a80881e8d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_topaz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_topaz.json @@ -89,8 +89,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_gypsum.json b/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_gypsum.json new file mode 100644 index 000000000..d01339c11 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_gypsum.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:earth/vein/normal_gypsum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_hematite.json b/kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_hematite.json new file mode 100644 index 000000000..dde0de71c --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_hematite.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:mars/vein/mars_hematite", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_cassiterite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_cassiterite.json new file mode 100644 index 000000000..1afc3113b --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_cassiterite.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_cassiterite", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_garnet.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_garnet.json new file mode 100644 index 000000000..1b3f77aec --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_garnet.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_garnet", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gold.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gold.json new file mode 100644 index 000000000..165774ba0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gold.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_gold", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gypsum.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gypsum.json new file mode 100644 index 000000000..86b586876 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gypsum.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_gypsum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_tetrahedrite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_tetrahedrite.json new file mode 100644 index 000000000..8d59dab39 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_tetrahedrite.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_tetrahedrite", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/nether/vein/nether_gypsum.json b/kubejs/data/tfg/worldgen/placed_feature/nether/vein/nether_gypsum.json new file mode 100644 index 000000000..9818e5b08 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/nether/vein/nether_gypsum.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:nether/vein/nether_gypsum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.veins.js b/kubejs/server_scripts/tfg/tags.veins.js index edac64ca6..da310cfa2 100644 --- a/kubejs/server_scripts/tfg/tags.veins.js +++ b/kubejs/server_scripts/tfg/tags.veins.js @@ -29,6 +29,7 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_garnierite') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_gold') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_graphite') + event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_gypsum') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_hematite') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_lapis') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_limonite') @@ -57,14 +58,25 @@ const registerTFGOreVeinFeatures = (event) => { // #endregion + // #region mars ores + + event.add('tfg:mars_veins', 'tfg:mars/vein/mars_hematite') + + // #endregion + + // #region moon ores event.add('tfg:moon_veins', 'tfg:moon/vein/moon_apatite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_bauxite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_beryllium') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_cassiterite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_desh') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_garnet') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_garnierite') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_gold') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_graphite') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_gypsum') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_lubricant') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_magnetite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_manganese') @@ -80,6 +92,7 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfg:moon_veins', 'tfg:moon/vein/moon_sheldonite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_silver') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_sphalerite') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_tetrahedrite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_topaz') // #endregion @@ -99,6 +112,7 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfg:nether_veins', 'tfg:nether/vein/nether_goethite') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_gold') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_graphite') + event.add('tfg:nether_veins', 'tfg:nether/vein/nether_gypsum') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_hematite') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_lapis') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_lubricant') From 3329a4904936caaf12bd53e95906a81474d4ea5f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:40:54 +0100 Subject: [PATCH 34/52] missing hematitic sand tag --- kubejs/server_scripts/minecraft/tags.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 57861a2b4..e949b3aa3 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -86,6 +86,8 @@ const registerMinecraftItemTags = (event) => { event.add('tfc:compost_greens', 'minecraft:warped_wart_block') event.add('forge:dyes/black', 'minecraft:ink_sac') + + event.add('tfc:hematitic_sand', 'minecraft:red_sand') } const registerMinecraftBlockTags = (event) => { From 3bcbcf6d060b4286cdbfac6aa770cd7f917720fd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:47:32 +0100 Subject: [PATCH 35/52] added recipe for new hypertube thing --- .../create_hypertube/recipes.js | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/create_hypertube/recipes.js b/kubejs/server_scripts/create_hypertube/recipes.js index 71ceca392..5088c2364 100644 --- a/kubejs/server_scripts/create_hypertube/recipes.js +++ b/kubejs/server_scripts/create_hypertube/recipes.js @@ -6,18 +6,34 @@ function registerCreateHypertubeRecipes(event) { event.recipes.gtceu.assembler('create_hypertube:hypertube') .itemInputs('2x #forge:plates/stainless_steel', '4x ae2:quartz_glass') .itemOutputs('8x create_hypertube:hypertube') - .EUt(512) - .duration(40) + .EUt(GTValues.VA[GTValues.HV]) + .duration(50) + event.recipes.gtceu.assembler('create_hypertube:entrance') .itemInputs('4x #forge:plates/stainless_steel','create:smart_chute' ,'greate:stainless_steel_cogwheel', 'ae2:charged_certus_quartz_crystal') .itemOutputs('create_hypertube:hypertube_entrance') .inputFluids(Fluid.of('gtceu:silicone_rubber', 288)) - .EUt(512) - .duration(80) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) + event.recipes.gtceu.assembler('create_hypertube:entrance_sbr') .itemInputs('4x #forge:plates/stainless_steel','create:smart_chute' ,'greate:stainless_steel_cogwheel', 'ae2:charged_certus_quartz_crystal') .itemOutputs('create_hypertube:hypertube_entrance') .inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 144)) - .EUt(512) - .duration(80) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) + + event.recipes.gtceu.assembler('create_hypertube:accelerator') + .itemInputs('2x #forge:plates/stainless_steel', 'greate:stainless_steel_cogwheel', 'ae2:fluix_crystal') + .itemOutputs('create_hypertube:hypertube_accelerator') + .inputFluids(Fluid.of('gtceu:silicone_rubber', 288)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) + + event.recipes.gtceu.assembler('create_hypertube:accelerator_sbr') + .itemInputs('2x #forge:plates/stainless_steel', 'greate:stainless_steel_cogwheel', 'ae2:fluix_crystal') + .itemOutputs('create_hypertube:hypertube_accelerator') + .inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 144)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) } From d41827abdc9bd4118ec107c7a05786fdd1e7454a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:56:06 +0100 Subject: [PATCH 36/52] oh you can just change this in the config! that's cool. Also changed the infinity wand recipe --- CHANGELOG.md | 1 + defaultconfigs/constructionwand-server.toml | 6 +++--- .../server_scripts/constructionwand/recipes.js | 5 ++--- .../constructionwand/modifications.js | 17 ----------------- kubejs/startup_scripts/main_startup_script.js | 1 - 5 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 kubejs/startup_scripts/constructionwand/modifications.js diff --git a/CHANGELOG.md b/CHANGELOG.md index cd8841714..1bdaf1a25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Alabaster is now renewable via rock breaker @gustovafing - Added a new ore vein to all dimensions for gypsum, calcite, borax, and fuller's earth @Pyritie - Added some more moon ore veins for copper, tin, gold, aluminium.. nothing exciting @Pyritie +- Changed the recipe for the infinity construction wand @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/defaultconfigs/constructionwand-server.toml b/defaultconfigs/constructionwand-server.toml index 220eb0a35..cec3045fc 100644 --- a/defaultconfigs/constructionwand-server.toml +++ b/defaultconfigs/constructionwand-server.toml @@ -8,7 +8,7 @@ [stone_wand] #Wand durability #Range: > 1 - durability = 131 + durability = 791 #Wand block limit #Range: > 1 limit = 9 @@ -24,7 +24,7 @@ [iron_wand] #Wand durability #Range: > 1 - durability = 250 + durability = 2303 #Wand block limit #Range: > 1 limit = 27 @@ -40,7 +40,7 @@ [diamond_wand] #Wand durability #Range: > 1 - durability = 1561 + durability = 12286 #Wand block limit #Range: > 1 limit = 128 diff --git a/kubejs/server_scripts/constructionwand/recipes.js b/kubejs/server_scripts/constructionwand/recipes.js index 4cb343b04..735911c33 100644 --- a/kubejs/server_scripts/constructionwand/recipes.js +++ b/kubejs/server_scripts/constructionwand/recipes.js @@ -45,13 +45,12 @@ function registerConstructionwandRecipes(event) { event.shaped('1x constructionwand:infinity_wand', [ ' EB', ' C ', - 'AD ' + 'A ' ], { A: '#forge:rods/polytetrafluoroethylene', C: '#forge:rods/long/aluminium', B: '#forge:double_plates/titanium', - D: '#gtceu:circuits/iv', - E: 'minecraft:nether_star', + E: 'ae2:charged_certus_quartz_crystal', }).id('constructionwand:shaped/infinity_wand') event.shaped('1x constructionwand:core_angel', [ diff --git a/kubejs/startup_scripts/constructionwand/modifications.js b/kubejs/startup_scripts/constructionwand/modifications.js deleted file mode 100644 index 89426c237..000000000 --- a/kubejs/startup_scripts/constructionwand/modifications.js +++ /dev/null @@ -1,17 +0,0 @@ -// priority: 0 -"use strict"; - -function registerConstructionWandsItemModifications(event) { - - // Increase durability of all construction wands - - event.modify('constructionwand:stone_wand', item => { - item.maxDamage = 791 - }) - event.modify('constructionwand:iron_wand', item => { - item.maxDamage = 2303 - }) - event.modify('constructionwand:diamond_wand', item => { - item.maxDamage = 12286 - }) -} \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 49568b2de..89d4001af 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -23,7 +23,6 @@ BlockEvents.modification(event => { ItemEvents.modification(event => { registerBeneathItemModifications(event) - registerConstructionWandsItemModifications(event) registerCreateItemModifications(event) registerFirmalifeItemModifications(event) registerGTCEuItemModifications(event) From 941a0e2d0c6523ef1d62a882a9d9e2b0f5c6e5b7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:59:56 +0100 Subject: [PATCH 37/52] tags to hide the sand piles from jei --- kubejs/server_scripts/tfg/tags.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 1e47a216e..bb62dbb3f 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -12,6 +12,19 @@ const registerTFGItemTags = (event) => { event.add('tfc:compost_greens_high', 'tfg:sunflower_product') event.add('tfg:water_breathing_ingredients', 'tfg:rapeseed_product') event.add('tfg:night_vision_ingredients', 'tfg:sunflower_product') + + event.add('c:hidden_from_recipe_viewers', 'tfg:ash_pile') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/black_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/brown_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/green_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/pink_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/red_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/white_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/yellow_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/mars_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/moon_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/venus_sand') + //temporary hidden items event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small') event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source') From b87c42be06e87decef9ef84ba28062bf5d40c36c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 23:11:35 +0100 Subject: [PATCH 38/52] langs --- kubejs/assets/gtceu/lang/en_us.json | 1 + kubejs/assets/tfg/lang/en_us.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 203ad05e9..57b015c45 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -180,6 +180,7 @@ "tagprefix.double_ingot": "%s Double Ingot", "tagprefix.poor_raw": "Poor Raw %s", "tagprefix.rich_raw": "Rich Raw %s", + "tagprefix.dusty_raw": "Dusty Raw %s", "tagprefix.gabbro": "Gabbro %s Ore", "tagprefix.shale": "Shale %s Ore", "tagprefix.claystone": "Claystone %s Ore", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 6cb99987b..a5aa37396 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -281,6 +281,8 @@ "block.tfg.rapeseed_dead": "Dead Canola", "block.tfg.casings.machine_casing_iron_desh": "Desh Machine Casing", "block.tfg.casings.machine_casing_stainless_evaporation": "Stainless Evaporation Machine Casing", + "block.tfg.casings.machine_casing_vacuum_engine_intake": "Vacuum Engine Intake Machine Casing", + "block.tfg.casings.machine_casing_mars": "Robust Dust-Proof Machine Casing", "block.tfg.casings.machine_casing_blue_solar_panel": "Basic Solar Panel Casing", "block.tfg.casings.machine_casing_green_solar_panel": "Advanced Solar Panel Casing", "block.tfg.casings.machine_casing_red_solar_panel": "Elite Solar Panel Casing", From bd379e106fef4e8e9c6e8b3399e944e634603fd6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 23:19:48 +0100 Subject: [PATCH 39/52] buffed these guys some more because goddamn the ae2 guns shred them --- defaultconfigs/wan_ancient_beasts-server.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/defaultconfigs/wan_ancient_beasts-server.toml b/defaultconfigs/wan_ancient_beasts-server.toml index f33c39ee8..272020a11 100644 --- a/defaultconfigs/wan_ancient_beasts-server.toml +++ b/defaultconfigs/wan_ancient_beasts-server.toml @@ -3,7 +3,7 @@ [sniffer] #Sniffer health [default: 75] #Range: 1.0 ~ 1024.0 - health = 75.0 + health = 150.0 #Sniffer armor [default: 3] #Range: 0.0 ~ 30.0 armor = 3.0 @@ -15,7 +15,7 @@ [eater] #Eater health [default: 100] #Range: 1.0 ~ 1024.0 - health = 200.0 + health = 400.0 #Eater attack damage [default: 30] #Range: 0.0 ~ 1024.0 damage = 30.0 @@ -30,7 +30,7 @@ [walker] #Walker health [default: 200] #Range: 1.0 ~ 1024.0 - health = 400.0 + health = 600.0 #Walker armor [default: 5] #Range: 0.0 ~ 30.0 armor = 14.0 @@ -42,28 +42,28 @@ [crusher] #Crusher health [default: 50] #Range: 1.0 ~ 1024.0 - health = 100.0 + health = 200.0 #Crusher attack damage [default: 10] #Range: 0.0 ~ 1024.0 damage = 10.0 #Crusher armor [default: 20] #Range: 0.0 ~ 30.0 - armor = 25.0 + armor = 35.0 #Crusher armor toughness [default: 4] #Range: 0.0 ~ 20.0 - armorToughness = 5.0 + armorToughness = 6.0 #Glider Attributes [glider] #Glider health [default: 25] #Range: 1.0 ~ 1024.0 - health = 50.0 + health = 150.0 #Soarer Attributes [soarer] #Soarer health [default: 40] #Range: 1.0 ~ 1024.0 - health = 80.0 + health = 250.0 #Soarer attack damage [default: 15] #Range: 0.0 ~ 1024.0 damage = 25.0 @@ -72,5 +72,5 @@ [surfer] #Surfer health [default: 30] #Range: 1.0 ~ 1024.0 - health = 30.0 + health = 150.0 From 1b8cec25ff53c48df50a50bedcf691e2be49070e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 23:44:08 +0100 Subject: [PATCH 40/52] some new quests --- .../chapters/applied_energistics_2.snbt | 3 ++ .../quests/chapters/hv__high_voltage.snbt | 48 +++++++++++++++++++ .../quests/chapters/questsmetallurgy.snbt | 9 ++++ kubejs/assets/tfg/lang/en_us.json | 9 ++++ 4 files changed, 69 insertions(+) diff --git a/config/ftbquests/quests/chapters/applied_energistics_2.snbt b/config/ftbquests/quests/chapters/applied_energistics_2.snbt index 69f3360bf..f7a7c7e05 100644 --- a/config/ftbquests/quests/chapters/applied_energistics_2.snbt +++ b/config/ftbquests/quests/chapters/applied_energistics_2.snbt @@ -1233,12 +1233,15 @@ } { dependencies: ["378E2294EFD85C65"] + description: ["{quests.ae2.programmed_circuit_card.desc}"] id: "51B34B3E51B6ECDD" + subtitle: "{quests.ae2.programmed_circuit_card.subtitle}" tasks: [{ id: "295980339E1FE027" item: "pccard:card_programmed_circuit" type: "item" }] + title: "{quests.ae2.programmed_circuit_card.title}" x: 1.0d y: -10.5d } diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 0b4a4cdeb..0b20e09a8 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1314,6 +1314,54 @@ x: 13.0d y: 1.5d } + { + dependencies: ["396E85A39FF414CF"] + description: ["{quests.high_voltage.hypertubes.desc}"] + icon: "create_hypertube:hypertube_entrance" + id: "194AB090A96CBC26" + optional: true + shape: "heart" + subtitle: "{quests.high_voltage.hypertubes.subtitle}" + tasks: [ + { + id: "284047DB1B1C022E" + item: "create_hypertube:hypertube_entrance" + type: "item" + } + { + disable_toast: true + id: "794148B8FFC9B001" + item: "create_hypertube:hypertube" + optional_task: true + type: "item" + } + ] + title: "{quests.high_voltage.hypertubes.title}" + x: 11.5d + y: -7.5d + } + { + dependencies: ["396E85A39FF414CF"] + description: ["{quests.high_voltage.wand.desc}"] + id: "6E370A161895A91B" + optional: true + shape: "heart" + subtitle: "{quests.high_voltage.wand.subtitle}" + tasks: [{ + id: "2311849F50A36265" + item: { + Count: 1 + id: "constructionwand:infinity_wand" + tag: { + wand_options: { } + } + } + type: "item" + }] + title: "{quests.high_voltage.wand.title}" + x: 13.0d + y: -8.0d + } ] subtitle: ["{quests.high_voltage.subtitle}"] title: "{quests.high_voltage}" diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index ae7f936e9..9d65ba8ec 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -308,6 +308,7 @@ } id: "tfc:kaolin_clay" } + match_nbt: false type: "item" weak_nbt_match: true }] @@ -966,7 +967,9 @@ } id: "tfc:metal/ingot/weak_red_steel" } + match_nbt: false type: "item" + weak_nbt_match: true } { id: "2A068958F7451FFB" @@ -980,7 +983,9 @@ } id: "tfc:metal/ingot/black_steel" } + match_nbt: false type: "item" + weak_nbt_match: true } ] title: "{quests.metal_age.highcarb_red_steel.title}" @@ -1157,7 +1162,9 @@ } id: "tfc:metal/ingot/weak_blue_steel" } + match_nbt: false type: "item" + weak_nbt_match: true } { id: "2755C292E4E19530" @@ -1171,7 +1178,9 @@ } id: "tfc:metal/ingot/black_steel" } + match_nbt: false type: "item" + weak_nbt_match: true } ] title: "{quests.metal_age.highcarb_blu_steel.title}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index a5aa37396..aeeb9ec16 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1118,6 +1118,9 @@ "quests.ae2.ae_guide.title": "Welcome to AE2", "quests.ae2.ae_guide.subtitle": "Another free book for your collection!", "quests.ae2.ae_guide.desc": "Here you are, ready to begin your &bAE2&r infrastructure!\n\nThis chapter will mainly guide you through what you can and cannot craft yet.\nWe’ll also highlight the most important items you should focus on.\n\nHowever, to fully understand Applied Energistics 2, we strongly recommend using the &bG&r keybind (similar to Create's Ponder system) or open the &bME Guide&r we provide as a reward from this quest. It’s the best in-game tutorial for AE2.\nAlternatively, watch some online videos about AE2 on &61.20.1&r for more detailed explanations — AE2 is a very popular mod, so there's a ton of tutorials out there!\n\n&dPro tip&r: Many &bAE2&r recipes have alternative Moon recipes that are much cheaper. Once again, investing in your Moon base will greatly reward you throughout the entire game.", + "quests.ae2.programmed_circuit_card.title": "Programmed Circuit Card", + "quests.ae2.programmed_circuit_card.subtitle": "An essential upgrade", + "quests.ae2.programmed_circuit_card.desc": "Insert one of these into your Pattern Providers, and if your recipe has a programmed circuit, the attached GregTech machine will automatically change its circuit to the one in the recipe. How useful is that?!", "quests.tasktype.checkmark": "Click here to complete this quest/task", "quests.tasktype.item.any": "Any Item of type:", "quests.tasktype.lookat": "Look at a:", @@ -1570,6 +1573,12 @@ "quests.high_voltage.space_survival.title": "Home away from home", "quests.high_voltage.space_survival.subtitle": "More than just a mining dimension", "quests.high_voltage.space_survival.desc": "If you haven't already, be sure to check out the &3Tips - Space Survival&r quest chapter! It contains all the information you'll need to establish a proper moon colony.", + "quests.high_voltage.hypertubes.title": "Hypertubes", + "quests.high_voltage.hypertubes.subtitle": "The future is now, old man", + "quests.high_voltage.hypertubes.desc": "Looking for a cooler way to quickly get around your base? Try &3Hypertubes&r! Just stand near one end and you'll be sucked up and transported to the other, and they can go in any direction too!\n\nThese do require Stress Units to power, but if you don't have a Create setup any more, you can turn EU into SU with a GregTech Energy Converter and an Electric Motor from &9&oCreate Crafts & Additions&r.", + "quests.high_voltage.wand.title": "Infinity Construction Wand", + "quests.high_voltage.wand.subtitle": "Ultimate skyblock tool", + "quests.high_voltage.wand.desc": "This wand does exactly the same thing as the other wands, except with &3no durability&r. Do you like building lots of tall buildings or paving over acres of pristine grassland? This is the tool for you!\n\nKeep in mind that Building Gadgets is available soon in &5EV&r, which provides even more powerful tools for avid builders.", "quests.low_voltage": "&7LV&r - Low Voltage", "quests.low_voltage.subtitle": "Tame electricity and begin your GregTech journey", "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", From df9e90efa6430c2e9ab89e62ad180b383b790260 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 12:26:39 +0100 Subject: [PATCH 41/52] fix brick recipe conflict --- CHANGELOG.md | 1 + kubejs/server_scripts/createdeco/recipes.js | 1 + kubejs/server_scripts/minecraft/recipes.js | 7 ------- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bdaf1a25..b35cb1cf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ - Added more missing food processor recipes (#1632, #1638) @Pyritie - Fixed a few stuck quests (#1667, #1666) @Wicpar - Fixed inconsistent quern and macerator recipes for small tfc ores (#1672) @Pyritie +- Fixed recipe conflict with ceramic bricks and create deco colored bricks @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index f51252196..1b43e3787 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -165,6 +165,7 @@ const registerCreatedecoRecipes = (event) => { .itemInputs('5x minecraft:brick', powder) .inputFluids(Fluid.of('gtceu:concrete', 144)) .itemOutputs(`4x createdeco:${type}_bricks`) + .circuit(3) .duration(50) .EUt(7) }); diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 16a2df8f5..5b96b8489 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -797,13 +797,6 @@ const registerMinecraftRecipes = (event) => { B: 'minecraft:brick' }).id('tfc:crafting/bricks') - event.recipes.gtceu.assembler('minecraft:bricks') - .itemInputs('5x minecraft:brick') - .inputFluids(Fluid.of('gtceu:concrete', 144)) - .itemOutputs(`4x minecraft:bricks`) - .duration(50) - .EUt(7) - //#endregion //#region Выход: Элитра From ca8ac9d727297cedba7e0a796d32c6b8229f56e6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 12:37:53 +0100 Subject: [PATCH 42/52] added some more vanilla blocks to the forge/bloomery insulation tag #1673 --- kubejs/server_scripts/minecraft/tags.js | 19 +++++++++++++++++++ kubejs/server_scripts/tfc/tags.js | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index e949b3aa3..94fc5ed0d 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -157,6 +157,25 @@ const registerMinecraftBlockTags = (event) => { event.add('tfg:brick_stairs', 'minecraft:blackstone_stairs') event.add('tfg:brick_slabs', 'minecraft:blackstone_slab') event.add('tfg:brick_walls', 'minecraft:blackstone_wall') + + event.add('tfc:bloomery_insulation', 'minecraft:polished_deepslate'); + event.add('tfc:forge_insulation', 'minecraft:polished_deepslate'); + event.add('tfc:bloomery_insulation', 'minecraft:polished_blackstone'); + event.add('tfc:forge_insulation', 'minecraft:polished_blackstone'); + event.add('tfc:bloomery_insulation', 'minecraft:deepslate_tiles'); + event.add('tfc:forge_insulation', 'minecraft:deepslate_tiles'); + event.add('tfc:bloomery_insulation', 'minecraft:cracked_deepslate_tiles'); + event.add('tfc:forge_insulation', 'minecraft:cracked_deepslate_tiles'); + event.add('tfc:bloomery_insulation', 'minecraft:chiseled_deepslate'); + event.add('tfc:forge_insulation', 'minecraft:chiseled_deepslate'); + event.add('tfc:bloomery_insulation', 'minecraft:chiseled_polished_blackstone'); + event.add('tfc:forge_insulation', 'minecraft:chiseled_polished_blackstone'); + event.add('tfc:bloomery_insulation', 'minecraft:gilded_blackstone'); + event.add('tfc:forge_insulation', 'minecraft:gilded_blackstone'); + event.add('tfc:bloomery_insulation', 'minecraft:basalt'); + event.add('tfc:forge_insulation', 'minecraft:basalt'); + event.add('tfc:bloomery_insulation', 'minecraft:smooth_basalt'); + event.add('tfc:forge_insulation', 'minecraft:smooth_basalt'); //#region diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 42227aa1f..1d8b81b14 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -130,7 +130,6 @@ const registerTFCItemTags = (event) => { event.add('tfc:steam_bloomery_basic_fuels', 'minecraft:coal') event.add('tfc:steam_bloomery_basic_fuels', 'minecraft:charcoal') event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:rich_raw_coal') - event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:rich_raw_coal') event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:raw_coal') event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:poor_raw_coal') event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:coal_dust') From 912bf72277e65d31adfe810b1c17fcd5182dc143 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 12:54:57 +0100 Subject: [PATCH 43/52] moved the lye to sodium hydroxide to the vacuumizer instead --- kubejs/server_scripts/tfc/recipes.js | 6 ------ .../vintage_improvements/recipes.js | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 3a5fadb02..4539c2c63 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -208,12 +208,6 @@ const registerTFCRecipes = (event) => { generateMixerRecipe(event, '#forge:dusts/sodium_hydroxide', "#tfg:clean_water 1000", [], null, Fluid.of('tfc:lye', 1000), 100, 2, 64, 'lye_from_sodium_hydroxide') - event.recipes.firmalife.vat() - .inputFluid(Fluid.of('tfc:lye', 1000)) - .outputItem('gtceu:sodium_hydroxide_dust') - .length(100) - .temperature(80) - event.recipes.gtceu.distillery('lye_to_sodium_hydroxide') .inputFluids('tfc:lye 1000') .itemOutputs('gtceu:sodium_hydroxide_dust') diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 10bd2cfb2..737505d4a 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -542,6 +542,9 @@ function registerVintageImprovementsRecipes(event) { // #region Vacuum + // Item to fluids: vacuumizing + // Fluids to item: pressurizing + event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ item: 'tfc:glue' }], @@ -621,11 +624,12 @@ function registerVintageImprovementsRecipes(event) { // Vulc. latex to raw rubber pulp event.custom({ - type: 'vintageimprovements:vacuumizing', + type: 'vintageimprovements:pressurizing', ingredients: [{ fluid: 'tfg:vulcanized_latex', amount: 250 }], results: [{ item: 'gtceu:raw_rubber_dust' }], + heatRequirement: "heated", processingTime: 120 - }).id('tfg:vi/vacuumizing/vulcanized_latex_to_raw_rubber') + }).id('tfg:vi/pressurizing/vulcanized_latex_to_raw_rubber') // Seed oils event.custom({ @@ -649,6 +653,14 @@ function registerVintageImprovementsRecipes(event) { processingTime: 100 }).id('tfg:vi/vacuumizing/seed_oil') + event.custom({ + type: 'vintageimprovements:pressurizing', + ingredients: [{ fluid: 'tfc:lye', amount: 1000 }], + results: [{ item: 'gtceu:sodium_hydroxide_dust' }], + heatRequirement: "heated", + processingTime: 300 + }).id('tfg:vi/pressurizing/lye') + // #endregion // #region Coiling From a3f91930013e44defc2649014e3a12ac2481f889 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 13:01:49 +0100 Subject: [PATCH 44/52] changed steel mech saw back to cobalt brass since you can craft it much more easily now --- kubejs/server_scripts/greate/recipes.js | 4 ++-- kubejs/server_scripts/greate/recipes.recycling.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index c82bbbdc5..122eb5c9e 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -414,7 +414,7 @@ function registerGreateRecipes(event) { 'FE ' ], { A: '#gtceu:circuits/ulv', - B: 'gtceu:black_steel_buzz_saw_blade', + B: 'gtceu:cobalt_brass_buzz_saw_blade', C: 'greate:steel_cogwheel', D: 'gtceu:ulv_machine_hull', E: 'greate:steel_shaft', @@ -422,7 +422,7 @@ function registerGreateRecipes(event) { }).id('greate:shaped/steel_mechanical_saw') event.recipes.gtceu.assembler('greate:steel_mechanical_saw') - .itemInputs('gtceu:ulv_machine_hull', 'greate:steel_shaft', '2x #gtceu:circuits/ulv', 'gtceu:black_steel_buzz_saw_blade', '2x greate:steel_cogwheel') + .itemInputs('gtceu:ulv_machine_hull', 'greate:steel_shaft', '2x #gtceu:circuits/ulv', 'gtceu:cobalt_brass_buzz_saw_blade', '2x greate:steel_cogwheel') .itemOutputs('greate:steel_mechanical_saw') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index 5f5c66785..a42c8e9de 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -381,7 +381,7 @@ function registerGreateRecyclingRecipes(event) { .itemInputs('greate:steel_mechanical_saw') .itemOutputs( ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlackSteel, 2), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.CobaltBrass, 2), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 4)) .duration(GTMaterials.CobaltBrass.getMass() * 16) .category(GTRecipeCategories.MACERATOR_RECYCLING) @@ -391,7 +391,7 @@ function registerGreateRecyclingRecipes(event) { .itemInputs('greate:steel_mechanical_saw') .itemOutputs( ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlackSteel, 2), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.CobaltBrass, 2), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.AnnealedCopper, 4)) .duration(GTMaterials.CobaltBrass.getMass() * 16) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) From 3b57773792b3206f0841fc514f4d66952726be59 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 13:03:23 +0100 Subject: [PATCH 45/52] langs --- kubejs/assets/tfg/lang/en_us.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index aeeb9ec16..ac4041a6e 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1772,7 +1772,7 @@ "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, &6for now&r).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembler&r (and it is especially useful &oin the near future&r).\n\n&eNote:&r You can also centrifuge TFC's &aGlue&r or &aConifer Rosin&r, whichever's easiest!", "quests.low_voltage.lv_cutter.title": "Basic Cutter", "quests.low_voltage.lv_cutter.subtitle": "The Cutter... cuts...", - "quests.low_voltage.lv_cutter.desc": "For now, you should use &9Water&r for its recipes instead of trying to acquire Lubricant.\n\nThe &3Cutting Machine&r additionally unlocks converting &6Rods into four Bolts&r.\n\nThis machine is the only way to obtain &dGem Plates&r, which are needed to craft Filters, and by extension, the &3Gas Collector&r.", + "quests.low_voltage.lv_cutter.desc": "For now, you should use &9Water&r for its recipes instead of trying to acquire Lubricant.\n\nIf you don't have one yet, this machine will also cut &6Rods into four Bolts&r.\n\nThis machine is the only way to obtain &dGem Plates&r, which are needed to craft Filters, and by extension, the &3Gas Collector&r.", "quests.low_voltage.lv_cutter.task": "Any cutter", "quests.low_voltage.lv_gas_collector.title": "Basic Gas Collector", "quests.low_voltage.lv_gas_collector.subtitle": "It'll take your breath away", @@ -2454,7 +2454,7 @@ "quests.steam_age.mechanical_harvester.desc": "Too lazy to harvest and replant your crops? These will do it for you! Place them on a spinning contraption and watch them go. These won't work on crops planted inside a greenhouse though.\n\nProtip: It's always a constant 15°C down at bedrock level, so it's a cool location for a farm that can grow crops all year round!", "quests.steam_age.mechanical_saw.title": "Mechanical Saw", "quests.steam_age.mechanical_saw.subtitle": "Efficient cutting of wood, stone, and your fingers", - "quests.steam_age.mechanical_saw.desc": "Tired of chopping trees? These will do it for you! Place them on a spinning contraption and watch them go. Unfortunately, you'll still have to replant the saplings them yourself until you get access to a Deployer.\n\nA Mechanical Saw can also double as a stonecutter, giving easier access to various forms of masonry. Using it to chop logs into lumber is also more efficient!", + "quests.steam_age.mechanical_saw.desc": "Tired of chopping trees? These will do it for you! Place them on a spinning contraption and watch them go. Unfortunately, you'll still have to replant the saplings them yourself until you get access to a Deployer.\n\nA Mechanical Saw can also double as a stonecutter, giving easier access to various forms of masonry. Using it to chop logs into lumber is also more efficient!\n\nYou can also use it to cut Rods into four Bolts!", "quests.steam_age.chute.title": "Early Logistics", "quests.steam_age.chute.subtitle": "Public infrastructure for your items", "quests.steam_age.chute.desc": "You now have access to ways to move your items around! Chutes are similar to hoppers and are cheaper, but can only move items downwards. Both of these can also push items from container into Item Pipes.\n\nFunnels are similar but are best paired with Belts instead of Item Pipes.", @@ -2603,7 +2603,7 @@ "quests.steam_age.lathe.desc": "The &3Lathe&r can automatically turn a single ingot into two rods, and single bolts into screws. If you're making a lot of those, and you will be, this machine will be a good investment.", "quests.steam_age.steel_saw.title": "Steel Mechanical Saw", "quests.steam_age.steel_saw.subtitle": "A stonecutter and LV Cutter in one!", - "quests.steam_age.steel_saw.desc": "It's an upgrade to your Basic Mechanical Saw that can also process some metal recipes, like turning rods into four bolts, and cutting blocks into plates. These recipes will all require a fluid to work, but you can just use water for now.\n\nYou can get a little Aluminium for the Cobalt Brass from ore processing byproducts! Check out that quest chapter for more information.", + "quests.steam_age.steel_saw.desc": "It's an upgrade to your Basic Mechanical Saw that can also process some metal recipes, like turning rods into four bolts, and cutting blocks into plates. These recipes will all require a fluid to work, but you can just use water for now.\n\nYou can also use this for cheaper Rubber Sheets, if you first use an Alloy Smelter to turn your pulp into a block.", "quests.steam_age.rolling_mill.title": "Rolling Mill", "quests.steam_age.rolling_mill.subtitle": "The other half of the LV Bender", "quests.steam_age.rolling_mill.desc.1": "Of all the steam age machines you could make, the &3Rolling Mill&r is one of the best, for the simple reason that it makes single plates out of single ingots. It can also make thin sheets cheaper than by hand, as a bonus!", From 8335dcc19a61a3d69e0448b210a6f5b84303fb9f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 15:01:12 +0100 Subject: [PATCH 46/52] pakku --- pakku-lock.json | 180 ++++++++++++++++++++++++------------------------ 1 file changed, 89 insertions(+), 91 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 8af7380b2..368c0d9b9 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -749,7 +749,7 @@ "files": [ { "type": "curseforge", - "file_name": "alltheleaks-1.0.0+1.20.1-forge.jar", + "file_name": "alltheleaks-1.0.1+1.20.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -757,16 +757,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6874/194/alltheleaks-1.0.0+1.20.1-forge.jar", - "id": "6874194", + "url": "https://edge.forgecdn.net/files/6916/160/alltheleaks-1.0.1+1.20.1-forge.jar", + "id": "6916160", "parent_id": "1091339", "hashes": { - "sha1": "24e32ff985ceac5ef964d49b76764ed6c700ac2e", - "md5": "baa29b8a4c714ea6bbc23a6cfd36c778" + "sha1": "13dda9865bb6ecff4f9cbea148f71215172ebe73", + "md5": "3f02888ca792a2daae94d68ba71edb18" }, "required_dependencies": [], - "size": 1134422, - "date_published": "2025-08-11T09:03:47.890Z" + "size": 1134589, + "date_published": "2025-08-22T19:39:22.777Z" } ] }, @@ -8483,9 +8483,31 @@ "modrinth": "EltpO5cN" }, "files": [ + { + "type": "modrinth", + "file_name": "lootr-forge-1.20-0.7.35.92.jar", + "mc_versions": [ + "1.20", + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/EltpO5cN/versions/9viyYois/lootr-forge-1.20-0.7.35.92.jar", + "id": "9viyYois", + "parent_id": "EltpO5cN", + "hashes": { + "sha512": "903ae0ba7077c86719399c32b4dba5726ce78c19f5eed8bb21acdbe1350cd3572fa2f1278a6b04d352b45ea12284bc97c24e77eab97500a44c0835e92288a0a2", + "sha1": "6e0c4289f06552c89bfe63b6d43a0609fecd6935" + }, + "required_dependencies": [], + "size": 458609, + "date_published": "2025-08-22T02:15:11.750259Z" + }, { "type": "curseforge", - "file_name": "lootr-forge-1.20-0.7.35.91.jar", + "file_name": "lootr-forge-1.20-0.7.35.92.jar", "mc_versions": [ "1.20.1", "1.20" @@ -8494,40 +8516,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6330/326/lootr-forge-1.20-0.7.35.91.jar", - "id": "6330326", + "url": "https://edge.forgecdn.net/files/6913/496/lootr-forge-1.20-0.7.35.92.jar", + "id": "6913496", "parent_id": "361276", "hashes": { - "sha1": "4175b32e3bc25b05c45cc84f70b585279a871d3c", - "md5": "512ee49d21782875b33513fb074eb098" + "sha1": "6e0c4289f06552c89bfe63b6d43a0609fecd6935", + "md5": "46f8cc588def48fc8971cdaae64b40ac" }, "required_dependencies": [], - "size": 458532, - "date_published": "2025-03-22T03:44:13.050Z" - }, - { - "type": "modrinth", - "file_name": "lootr-forge-1.20-0.7.35.91.jar", - "mc_versions": [ - "1.19.3", - "1.19.4", - "1.20", - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/EltpO5cN/versions/HmhkyU8X/lootr-forge-1.20-0.7.35.91.jar", - "id": "HmhkyU8X", - "parent_id": "EltpO5cN", - "hashes": { - "sha512": "9b576ec6008a5c86ce9ea218285bc133f49e9eaf8f4b854fa49170a9cc3c8de028b236f2e563493405732277fd1d2909520d5961076b3ddbffcb0c7c539b4826", - "sha1": "4175b32e3bc25b05c45cc84f70b585279a871d3c" - }, - "required_dependencies": [], - "size": 458532, - "date_published": "2025-07-15T09:13:32.531920Z" + "size": 458609, + "date_published": "2025-08-22T02:12:46.677Z" } ] }, @@ -10132,27 +10130,6 @@ "modrinth": "pYFUU6cq" }, "files": [ - { - "type": "curseforge", - "file_name": "particular-1.20.1-Forge-1.2.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6603/252/particular-1.20.1-Forge-1.2.4.jar", - "id": "6603252", - "parent_id": "1219053", - "hashes": { - "sha1": "4dc0cfd572151816c939d2896ad8f13838cb7cf6", - "md5": "ce29494f89ec662a19a954fa054ad49b" - }, - "required_dependencies": [], - "size": 421834, - "date_published": "2025-05-31T23:14:51.347Z" - }, { "type": "modrinth", "file_name": "particular-1.20.1-Forge-1.2.4.jar", @@ -10173,6 +10150,27 @@ "required_dependencies": [], "size": 421834, "date_published": "2025-06-06T19:00:04.136808Z" + }, + { + "type": "curseforge", + "file_name": "particular-1.20.1-Forge-1.2.7.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6916/904/particular-1.20.1-Forge-1.2.7.jar", + "id": "6916904", + "parent_id": "1219053", + "hashes": { + "sha1": "db04a6b14b7fb219701c50907986384bca363298", + "md5": "de5105497a7fa79ab099a592879ef260" + }, + "required_dependencies": [], + "size": 420332, + "date_published": "2025-08-22T23:10:47.973Z" } ] }, @@ -13235,34 +13233,9 @@ "modrinth": "lNttW2Xl" }, "files": [ - { - "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.7.10.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6872/582/TerraFirmaGreg-Core-Modern-0.7.10.jar", - "id": "6872582", - "parent_id": "513402", - "hashes": { - "sha1": "9a5c98fcaef9d12fdc1a86035ebf4f9170d1cb2e", - "md5": "ca805dc57f89624bf9e53e4f9babda0a" - }, - "required_dependencies": [ - "890405", - "302973" - ], - "size": 515916, - "date_published": "2025-08-10T20:34:53.927Z" - }, { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.7.10.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.7.11.jar", "mc_versions": [ "1.20.1" ], @@ -13271,19 +13244,44 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/8m3psJno/TerraFirmaGreg-Core-Modern-0.7.10.jar", - "id": "8m3psJno", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/oiDw0Fhg/TerraFirmaGreg-Core-Modern-0.7.11.jar", + "id": "oiDw0Fhg", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "bb8b2907e7dcf1e630aac76575cefc04cc594b6da0aeafa76bed5a5838677720bddf2b134d3480e06e850ff041f3963b1d22803c8ac873f315e32b698f01ef29", - "sha1": "9a5c98fcaef9d12fdc1a86035ebf4f9170d1cb2e" + "sha512": "cee41d5314832cc92ce25e8c33298e15bf478907739d3a932b0e96e79b741e1314c67fae538997066b06e47cf079b13117073aaab6c946e0311581d3b9f2bace", + "sha1": "b69f0c4aadf8edfb7b3e3864af70d35d84a45a77" }, "required_dependencies": [ "JaCEZUhg", "7tG215v7" ], - "size": 515916, - "date_published": "2025-08-10T20:34:55.642076Z" + "size": 584412, + "date_published": "2025-08-23T12:10:49.232137Z" + }, + { + "type": "curseforge", + "file_name": "TerraFirmaGreg-Core-Modern-0.7.11.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6918/492/TerraFirmaGreg-Core-Modern-0.7.11.jar", + "id": "6918492", + "parent_id": "513402", + "hashes": { + "sha1": "b69f0c4aadf8edfb7b3e3864af70d35d84a45a77", + "md5": "8d41611089b9a9ad0e018cbf93f8b680" + }, + "required_dependencies": [ + "890405", + "302973" + ], + "size": 584412, + "date_published": "2025-08-23T12:10:47.487Z" } ] }, From c7769c13827a535060d4ddeceb846ea85028fd71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Nieto?= Date: Sat, 23 Aug 2025 17:53:12 +0200 Subject: [PATCH 47/52] fix: Fixed Oven quest after tongs were removed, still need russian localization update (#1677) --- .../quests/chapters/queststfc_tips.snbt | 23 ++++++++++++++++++- kubejs/assets/tfg/lang/en_us.json | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 84b582024..843a2eb36 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -480,8 +480,29 @@ type: "item" } { + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfchotornot:tongs/wood" + tag: { + Damage: 0 + } + } id: "45EFF5E3C4FB5D77" - item: "firmalife:peel" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfchotornot:insulating)" + } + } + optional_task: true + title: "Any #tfchotornot:insulating" type: "item" } ] diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ac4041a6e..22f9adf86 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -3329,7 +3329,7 @@ "quests.tfg_tips.candles.desc": "Candles can be crafted using &aParaffix Wax, Beeswax&r or &aRosin.&r\nCandles are the better light source compared to torches, staying lit for 1 month and 2 days.", "quests.tfg_tips.oven.title": "Oven", "quests.tfg_tips.oven.subtitle": "Caution, it's hot", - "quests.tfg_tips.oven.desc": "The &3Oven&r is a multiblock structure that can be used to easily cook foods as well as perform exclusive recipes. The &aBottom Oven, Top Oven&r and the &aChimney&r are mandatory components. And don't forget the &dPeel&r, used for picking up food from the &aTop Oven.&r\nMore information on how to build an &3Oven&r can be found in the &2Field Guide.&r\n\n&3&lTip:&r&o: The only food that can satisfy all 5 nutrient groups, &cPizza&f, must be cooked in an oven.", + "quests.tfg_tips.oven.desc": "The &3Oven&r is a multiblock structure that can be used to easily cook foods as well as perform exclusive recipes. The &aBottom Oven, Top Oven&r and the &aChimney&r are mandatory components. And don't forget to use &dTongs&r to pick up food from the &aTop Oven.&r\nMore information on how to build an &3Oven&r can be found in the &2Field Guide.&r\n\n&3&lTip:&r&o: The only food that can satisfy all 5 nutrient groups, &cPizza&f, must be cooked in an oven.", "quests.tfg_tips.oven_appliances.title": "Oven Appliances", "quests.tfg_tips.oven_appliances.subtitle": "Get more out of your Ovens", "quests.tfg_tips.oven_appliances.desc": "&3Oven Appliances&r are optional components that must be placed on top of &aBottom Ovens&r to receive heat. Remember you can have &cmultiple&r &aBottom Ovens&r in a single multiblock.\n\n&dWrought Iron Grill&r: Allows you to cook food at a much faster rate and provides a &cbonus&r to shelf life.\n&dVat&r: can process pot recipes in bulk! Extremely useful for making &eLatex&r and &aJam.&r\n&dJarring Station&r: must be place next to a &bVat&r, fills up jars with &aJam.&r\n&dPot&r: if you need to cook soups.", From de0d71a0660375021155e507282722551dc97707 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 17:11:49 +0100 Subject: [PATCH 48/52] create additions is a buggy ass mod --- CHANGELOG.md | 2 + .../create_additions/recipes.js | 45 ++++++++++--------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b35cb1cf7..f00a254cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,8 @@ - Added a new ore vein to all dimensions for gypsum, calcite, borax, and fuller's earth @Pyritie - Added some more moon ore veins for copper, tin, gold, aluminium.. nothing exciting @Pyritie - Changed the recipe for the infinity construction wand @Pyritie +- Rebalanced the liquid blaze burner fuel recipes to be more in-line with GregTech generation @Pyritie +- Changed the recipes for the circuit boards required for the electron tube and vacuum tube, and phenolic circuit board @TomPlop ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 2b761d5f1..da063578e 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -113,6 +113,7 @@ const registerCreateAdditionsRecipes = (event) => { processingTime: 20 * 6 }).id(`tfg:vi/lathe/straw`) + // the amount is hardcoded to 100mb because create additions sucks event.custom({ type: 'createaddition:liquid_burning', input: { @@ -126,99 +127,99 @@ const registerCreateAdditionsRecipes = (event) => { type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:creosote', - amount: 160 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 500 }).id('tfg:createadditions/liquid_burning/creosote') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:biomass', - amount: 40 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 2000 }).id('tfg:createadditions/liquid_burning/biomass') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:oil', - amount: 200 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 400 }).id('tfg:createadditions/liquid_burning/oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:oil_heavy', - amount: 32 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 2500 }).id('tfg:createadditions/liquid_burning/oil_heavy') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:sulfuric_heavy_fuel', - amount: 32 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 2500 }).id('tfg:createadditions/liquid_burning/sulfuric_heavy_fuel') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:heavy_fuel', - amount: 16 + amount: 100 }, - burnTime: 30 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/heavy_fuel') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:fish_oil', - amount: 50 + amount: 100 }, - burnTime: 100 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/fish_oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluid: 'tfc:olive_oil', - amount: 50 + amount: 100 }, - burnTime: 150 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/olive_oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluid: 'firmalife:soybean_oil', - amount: 50 + amount: 100 }, - burnTime: 150 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/soybean_oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:seed_oil', - amount: 50 + amount: 100 }, - burnTime: 150 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/seed_oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluid: 'gtceu:steam', - amount: 256 + amount: 100 }, - burnTime: 4 * 9 * 9 + burnTime: 1 }).id('tfg:createadditions/liquid_burning/steam') //#endregion From 18f37c23fa963f123608afc57a6c09781948bb49 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 17:12:25 +0100 Subject: [PATCH 49/52] removed campfire from passive heaters --- kubejs/server_scripts/create/tags.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 2cdde4e17..a452f380f 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -100,6 +100,8 @@ const registerCreateBlockTags = (event) => { event.add('create:chest_mounted_storage', '#forge:chests/wooden') event.add('create:chest_mounted_storage', 'framedblocks:framed_chest') + + event.add('create:passive_boiler_heaters', 'minecraft:campfire') } From fa67078182b8121113d2c0a2335c1cd48409ffae Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 17:16:46 +0100 Subject: [PATCH 50/52] added moon rabbits and birts to the carryon whitelist --- config/carryon-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/carryon-common.toml b/config/carryon-common.toml index e0832b465..68f3a8ec1 100644 --- a/config/carryon-common.toml +++ b/config/carryon-common.toml @@ -57,7 +57,7 @@ [whitelist] #Whitelist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config #Entities that CAN be picked up (useWhitelistEntities must be true) - allowedEntities = ["tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit"] + allowedEntities = ["tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfg:moon_rabbit", "species:birt"] #Blocks that CAN be picked up (useWhitelistBlocks must be true) allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "afc:wood/chest/*", "afc:wood/trapped_chest/*", "#forge:chests/wooden"] #Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true) From ac99b9db8775c7de3d76b9b39da862e17736f1d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 18:30:27 +0100 Subject: [PATCH 51/52] Solar tweaks (#1678) * solar tweaks * langs --- CHANGELOG.md | 1 + kubejs/assets/tfg/lang/en_us.json | 2 +- kubejs/assets/tfg/lang/uk_ua.json | 2 +- kubejs/data/ad_astra/planets/earth.json | 2 +- kubejs/data/ad_astra/planets/mars.json | 2 +- kubejs/data/ad_astra/planets/moon.json | 2 +- kubejs/data/ad_astra/planets/venus.json | 2 +- .../gregtech/recipes.machines.js | 49 ++++++++++++++----- kubejs/startup_scripts/gtceu/recipe_types.js | 2 +- 9 files changed, 46 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f00a254cf..8f4c4e0cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Removed the mod that was causing placed entities to sometimes not spawn - Removed energy P2P (#1661) @TomPlop @BlueBoat29 - Removed GT bedrock miners, replaced with a new system for Moon infinites (#1569) @TomPlop +- Buffed Large Solar Panel MK I so now it has a consistent EV-generating recipe, but halved the output of ad astra solar panels on the moon @TomPlop @Pyritie ### Changes - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 22f9adf86..675ede7fa 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -963,7 +963,7 @@ "tfg.tooltip.support.tier2": "§717 x 9 x 17", "tfg.tooltip.support.tier3": "§733 x 13 x 33", "tfg.tooltip.vessels": "§cMax: 3024mB", - "tfg.tooltip.solar_panel.single": "Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.single": "Produces §6128 FE/t§r (32 EU/t) on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index cfb3c8cda..90382694b 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -956,7 +956,7 @@ "tfg.tooltip.support.tier2": "§717 x 9 x 17", "tfg.tooltip.support.tier3": "§733 x 13 x 33", "tfg.tooltip.vessels": "§cМакс: 3024mB", - "tfg.tooltip.solar_panel.single": "Виробляє §6256 FE/t§r (64 EU/t) на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.solar_panel.single": "Виробляє §6128 FE/t§r (32 EU/t) на §6Місяці§r протягом §6дня§r", "tfg.tooltip.solar_panel.large_tier1": "Гігантська структура, що виробляє від §61024 до 4096 EU/t§r на §6Місяці§r протягом §6дня§r", "tfg.tooltip.solar_panel.large_tier2": "Гігантська структура, що виробляє від §64096 до 16384 EU/t§r на §6Місяці§r протягом §6дня§r", "tfg.tooltip.solar_panel.large_tier3": "Гігантська структура, що виробляє від §616384 до 65536 EU/t§r на §6Місяці§r протягом §6дня§r", diff --git a/kubejs/data/ad_astra/planets/earth.json b/kubejs/data/ad_astra/planets/earth.json index 72bb5ad14..f78621687 100644 --- a/kubejs/data/ad_astra/planets/earth.json +++ b/kubejs/data/ad_astra/planets/earth.json @@ -3,7 +3,7 @@ "gravity": 9.807, "orbit": "ad_astra:earth_orbit", "oxygen": true, - "solar_power": 32, + "solar_power": 16, "solar_system": "ad_astra:solar_system", "temperature": 15, "tier": 1 diff --git a/kubejs/data/ad_astra/planets/mars.json b/kubejs/data/ad_astra/planets/mars.json index 37c5c5f50..bd5e4a25d 100644 --- a/kubejs/data/ad_astra/planets/mars.json +++ b/kubejs/data/ad_astra/planets/mars.json @@ -3,7 +3,7 @@ "gravity": 3.72076, "orbit": "ad_astra:mars_orbit", "oxygen": false, - "solar_power": 32, + "solar_power": 16, "solar_system": "ad_astra:solar_system", "temperature": -65, "tier": 2 diff --git a/kubejs/data/ad_astra/planets/moon.json b/kubejs/data/ad_astra/planets/moon.json index 0205ab90e..c8f638877 100644 --- a/kubejs/data/ad_astra/planets/moon.json +++ b/kubejs/data/ad_astra/planets/moon.json @@ -3,7 +3,7 @@ "gravity": 1.622, "orbit": "ad_astra:moon_orbit", "oxygen": false, - "solar_power": 256, + "solar_power": 128, "solar_system": "ad_astra:solar_system", "temperature": -173, "tier": 1 diff --git a/kubejs/data/ad_astra/planets/venus.json b/kubejs/data/ad_astra/planets/venus.json index ed182032e..05d66842f 100644 --- a/kubejs/data/ad_astra/planets/venus.json +++ b/kubejs/data/ad_astra/planets/venus.json @@ -3,7 +3,7 @@ "gravity": 8.87, "orbit": "ad_astra:venus_orbit", "oxygen": false, - "solar_power": 32, + "solar_power": 16, "solar_system": "ad_astra:solar_system", "temperature": 465, "tier": 3 diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 0131d3b0e..e65392484 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -1040,33 +1040,36 @@ function registerGTCEuMachineRecipes(event) { // Solar T1 - event.recipes.gtceu.large_solar_panel('solar_panel_t1_cheap') - .notConsumable('tfg:photo_cell_t1') + event.recipes.gtceu.large_solar_panel('solar_panel_t1_emergency') + .chancedInput('tfg:photo_cell_t1', 100, 0) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') - .EUt(-(GTValues.V[GTValues.HV]), 2) + .EUt(-((GTValues.V[GTValues.HV])), 2) .circuit(1) event.recipes.gtceu.large_solar_panel('solar_panel_t1') - .chancedInput('tfg:photo_cell_t1', 500, 0) + .notConsumable('tfg:photo_cell_t1') + .perTick(true) + .chancedFluidInput('tfg:compressed_trimix_3 4', 5000, 0) + .perTick(false) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') - .EUt(-((GTValues.V[GTValues.EV])), 2) + .EUt(-(GTValues.V[GTValues.EV]), 2) .circuit(2) // Solar T2 - event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_cheap') - .chancedInput('ad_astra:photovoltaic_etrium_cell', 500, 0) + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_emergency') + .chancedInput('ad_astra:photovoltaic_etrium_cell', 100, 0) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') .EUt(-(GTValues.V[GTValues.EV]), 2) .circuit(1) - event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2') + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_strong') .notConsumable('ad_astra:photovoltaic_etrium_cell') .perTick(true) .chancedFluidInput('tfg:solar_coolant 10', 5000, 0) @@ -1079,17 +1082,28 @@ function registerGTCEuMachineRecipes(event) { .EUt(-(GTValues.V[GTValues.IV]), 2) .circuit(2) + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_cheap') + .notConsumable('ad_astra:photovoltaic_etrium_cell') + .perTick(true) + .inputFluids('tfg:compressed_trimix_3 1') + .perTick(false) + .duration(20 * 20) + .daytime(false) + .dimension('ad_astra:moon') + .EUt(-(GTValues.V[GTValues.EV]), 2) + .circuit(3) + // Solar T3 - event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_cheap') - .chancedInput('ad_astra:photovoltaic_vesnium_cell', 500, 0) + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_emergency') + .chancedInput('ad_astra:photovoltaic_vesnium_cell', 100, 0) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') .EUt(-(GTValues.V[GTValues.IV]), 2) .circuit(1) - event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3') + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_strong') .notConsumable('ad_astra:photovoltaic_vesnium_cell') .perTick(true) .chancedFluidInput('tfg:solar_coolant_tier2 10', 5000, 0) @@ -1102,6 +1116,19 @@ function registerGTCEuMachineRecipes(event) { .EUt(-(GTValues.V[GTValues.LuV]), 2) .circuit(2) + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_cheap') + .notConsumable('ad_astra:photovoltaic_vesnium_cell') + .perTick(true) + .chancedFluidInput('tfg:solar_coolant 10', 5000, 0) + .inputFluids('tfg:cryogenized_fluix 4') + .outputFluids('tfg:fluix 1') + .perTick(false) + .duration(20 * 20) + .daytime(false) + .dimension('ad_astra:moon') + .EUt(-(GTValues.V[GTValues.IV]), 2) + .circuit(2) + //#endregion //#region Mars Ore Line diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 94554dc48..f7afe396e 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -23,7 +23,7 @@ const registerGTCEuRecipeTypes = (event) => { event.create('large_solar_panel') .category('generator') .setEUIO('out') - .setMaxIOSize(2, 0, 0, 0) + .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) From 2ebfaf2e3a7f744e233fc6170af5f56cb7a1b55e Mon Sep 17 00:00:00 2001 From: TomPlop Date: Sat, 23 Aug 2025 15:13:07 -0400 Subject: [PATCH 52/52] Board rework (#1679) * fix board * remove from tag * more update * last changes * Add new quests * fix the weird file * Fixes * fix quest optional --- .../quests/chapters/hv__high_voltage.snbt | 313 ++++++++++++++---- .../quests/chapters/questssteam_age.snbt | 20 +- kubejs/assets/gtceu/lang/en_us.json | 4 - .../item/high_density_treated_fiberboard.png | Bin 0 -> 289 bytes .../item/treated_chipboard_composite.png | Bin 0 -> 336 bytes kubejs/server_scripts/create/recipes.js | 4 +- kubejs/server_scripts/gregtech/recipes.js | 9 +- .../gregtech/recipes.machines.js | 40 ++- .../gregtech/recipes.removes.js | 12 - kubejs/server_scripts/gregtech/tags.js | 2 + kubejs/startup_scripts/gtceu/items.js | 6 + 11 files changed, 308 insertions(+), 102 deletions(-) create mode 100644 kubejs/assets/tfg/textures/item/high_density_treated_fiberboard.png create mode 100644 kubejs/assets/tfg/textures/item/treated_chipboard_composite.png diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 0b20e09a8..6b5ec9584 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -525,11 +525,18 @@ id: "42FB276AB16258D9" size: 1.0d subtitle: "{quests.high_voltage.fluorine.subtitle}" - tasks: [{ - id: "4EF4F33BEB714485" - item: "gtceu:fluorine_bucket" - type: "item" - }] + tasks: [ + { + id: "4EF4F33BEB714485" + item: "gtceu:fluorine_bucket" + optional_task: true + type: "item" + } + { + id: "7245625D6C687E3A" + type: "checkmark" + } + ] title: "{quests.high_voltage.fluorine.title}" x: 1.0d y: 4.5d @@ -568,14 +575,22 @@ { dependencies: ["5BACED5AE350EAB1"] description: ["{quests.high_voltage.nitrobenzene.desc}"] + icon: "gtceu:nitrobenzene_bucket" id: "56E7A3A0CC690C8A" shape: "square" size: 1.0d - tasks: [{ - id: "33CF24B0A19D2F25" - item: "gtceu:nitrobenzene_bucket" - type: "item" - }] + tasks: [ + { + id: "33CF24B0A19D2F25" + item: "gtceu:nitrobenzene_bucket" + optional_task: true + type: "item" + } + { + id: "70D29F223E0CC5CB" + type: "checkmark" + } + ] title: "{quests.high_voltage.nitrobenzene.title}" x: -1.0d y: 9.5d @@ -723,11 +738,18 @@ id: "5BACED5AE350EAB1" size: 1.0d subtitle: "{quests.high_voltage.nitric_acid.subtitle}" - tasks: [{ - id: "5F8F684990622DE1" - item: "gtceu:nitric_acid_bucket" - type: "item" - }] + tasks: [ + { + id: "5F8F684990622DE1" + item: "gtceu:nitric_acid_bucket" + optional_task: true + type: "item" + } + { + id: "24520333587F2436" + type: "checkmark" + } + ] title: "{quests.high_voltage.nitric_acid.title}" x: 0.0d y: 9.5d @@ -735,15 +757,23 @@ { dependencies: ["5BACED5AE350EAB1"] description: ["{quests.high_voltage.cetane_diesel.desc}"] + icon: "gtceu:cetane_boosted_diesel_bucket" id: "04F6E968CEEC3D49" shape: "square" size: 1.0d subtitle: "{quests.high_voltage.cetane_diesel.subtitle}" - tasks: [{ - id: "51D904AA29256F8D" - item: "gtceu:cetane_boosted_diesel_bucket" - type: "item" - }] + tasks: [ + { + id: "51D904AA29256F8D" + item: "gtceu:cetane_boosted_diesel_bucket" + optional_task: true + type: "item" + } + { + id: "6BFCFA5257BE071F" + type: "checkmark" + } + ] title: "{quests.high_voltage.cetane_diesel.title}" x: 1.0d y: 9.5d @@ -831,11 +861,18 @@ icon: "gtceu:ammonia_bucket" id: "4343746E706264E6" size: 1.0d - tasks: [{ - id: "1C3EBA2535471DB6" - item: "gtceu:ammonia_bucket" - type: "item" - }] + tasks: [ + { + id: "1C3EBA2535471DB6" + item: "gtceu:ammonia_bucket" + optional_task: true + type: "item" + } + { + id: "6445F5DC9728583A" + type: "checkmark" + } + ] title: "{quests.high_voltage.ammonia.title}" x: -3.0d y: 6.0d @@ -973,6 +1010,8 @@ "{@pagebreak}" "{quests.high_voltage.space_alloy.desc.2}" ] + hide_details_until_startable: false + icon: "gtceu:rocket_alloy_t1_ingot" id: "56D337E264A4154F" subtitle: "{quests.high_voltage.space_alloy.subtitle}" tasks: [ @@ -1199,23 +1238,6 @@ x: 0.0d y: 11.0d } - { - dependencies: ["14D277A164202FF8"] - description: [ - "{quests.high_voltage.bedrock_miner.desc.1}" - "{@pagebreak}" - "{quests.high_voltage.bedrock_miner.desc.2}" - ] - id: "2878C147D273F774" - subtitle: "{quests.high_voltage.bedrock_miner.subtitle}" - tasks: [{ - id: "55981710612D21D7" - item: "gtceu:mv_bedrock_ore_miner" - type: "item" - }] - x: 2.5d - y: -10.5d - } { description: ["{quests.high_voltage.kaolinite_powder.desc}"] disable_toast: true @@ -1315,40 +1337,185 @@ y: 1.5d } { - dependencies: ["396E85A39FF414CF"] - description: ["{quests.high_voltage.hypertubes.desc}"] - icon: "create_hypertube:hypertube_entrance" - id: "194AB090A96CBC26" - optional: true - shape: "heart" - subtitle: "{quests.high_voltage.hypertubes.subtitle}" + dependencies: ["00A2566109144D7F"] + description: ["{quests.high_voltage.moon_harvester.desc}"] + id: "6A21CCAEB1FDF38E" + shape: "octagon" + size: 2.0d + subtitle: "{quests.high_voltage.moon_harvester.subtitle}" + tasks: [{ + id: "445320F445BA829F" + item: "gtceu:moon_dust_harvester" + type: "item" + }] + title: "{quests.high_voltage.moon_harvester.title}" + x: 16.0d + y: -2.0d + } + { + dependencies: ["6A21CCAEB1FDF38E"] + description: ["{quests.high_voltage.regolith_vapor.desc}"] + icon: "gtceu:regolith_vapor_bucket" + id: "578ECB10B30A77C7" + subtitle: "{quests.high_voltage.regolith_vapor.subtitle}" tasks: [ { - id: "284047DB1B1C022E" - item: "create_hypertube:hypertube_entrance" - type: "item" - } - { - disable_toast: true - id: "794148B8FFC9B001" - item: "create_hypertube:hypertube" + id: "0FF209271DB58067" + item: "gtceu:regolith_vapor_bucket" optional_task: true type: "item" } + { + id: "32E19F49E3A2D54B" + title: "{quests.high_voltage.regolith_vapor.task}" + type: "checkmark" + } ] - title: "{quests.high_voltage.hypertubes.title}" - x: 11.5d - y: -7.5d + title: "{quests.high_voltage.regolith_vapor.title}" + x: 17.5d + y: -2.5d + } + { + dependencies: ["6A21CCAEB1FDF38E"] + description: ["{quests.high_voltage.regolith_dust.desc}"] + id: "0527DF6A8567FED9" + subtitle: "{quests.high_voltage.regolith_dust.subtitle}" + tasks: [ + { + id: "567BAEEB6120F6CE" + item: "tfg:certus_regolith_dust" + type: "item" + } + { + id: "5507A8B1561AC3C3" + item: "tfg:cassiterite_regolith_dust" + type: "item" + } + { + id: "13C520F021B2E085" + item: "tfg:bright_regolith_dust" + type: "item" + } + { + id: "3565544FF49B9F50" + item: "tfg:goethe_regolith_dust" + type: "item" + } + ] + title: "{quests.high_voltage.regolith_dust.title}" + x: 17.5d + y: -1.5d + } + { + dependencies: [ + "0527DF6A8567FED9" + "578ECB10B30A77C7" + ] + description: ["{quests.high_voltage.dusty_ores.desc}"] + id: "5807400FD1F0998A" + subtitle: "{quests.high_voltage.dusty_ores.subtitle}" + tasks: [{ + id: "131B1D5F37FAC1F3" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:dusty_raw_goethite)item(gtceu:dusty_raw_cassiterite)item(gtceu:dusty_raw_certus_quartz)item(gtceu:dusty_raw_gold)item(gtceu:dusty_raw_diamond))" + } + } + title: "{quests.high_voltage.dusty_ores.task}" + type: "item" + }] + title: "{quests.high_voltage.dusty_ores.title}" + x: 18.5d + y: -2.0d + } + { + dependencies: ["5807400FD1F0998A"] + description: ["{quests.high_voltage.final_dust.desc}"] + id: "36FE3DDBCB535639" + subtitle: "{quests.high_voltage.final_dust.subtitle}" + tasks: [ + { + id: "1ABCC8007A69EF81" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:iron_dust" + } + type: "item" + } + { + id: "3AB1A3B8E6EB4291" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:copper_dust" + } + type: "item" + } + { + id: "1D38FECBB23C3E24" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:tin_dust" + } + type: "item" + } + { + id: "6C9C5498495F330C" + item: "ae2:certus_quartz_dust" + type: "item" + } + { + id: "0AF375FA38D44C32" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:gold_dust" + } + type: "item" + } + { + id: "6896A082D722EECB" + item: "gtceu:diamond_dust" + type: "item" + } + ] + title: "{quests.high_voltage.final_dust.title}" + x: 19.5d + y: -2.0d } { dependencies: ["396E85A39FF414CF"] description: ["{quests.high_voltage.wand.desc}"] - id: "6E370A161895A91B" + id: "22FD785F84E9D10D" optional: true shape: "heart" subtitle: "{quests.high_voltage.wand.subtitle}" tasks: [{ - id: "2311849F50A36265" + id: "525F329DD5F16E1F" item: { Count: 1 id: "constructionwand:infinity_wand" @@ -1362,6 +1529,28 @@ x: 13.0d y: -8.0d } + { + dependencies: ["396E85A39FF414CF"] + description: ["{quests.high_voltage.hypertubes.desc}"] + id: "159A0DAEE55DCAC0" + optional: true + subtitle: "{quests.high_voltage.hypertubes.subtitle}" + tasks: [ + { + id: "033B6A5EC2C17485" + item: "create_hypertube:hypertube_entrance" + type: "item" + } + { + id: "2EBA07A9A9B6D1EB" + item: "create_hypertube:hypertube" + type: "item" + } + ] + title: "{quests.high_voltage.hypertubes.title}" + x: 11.5d + y: -7.5d + } ] subtitle: ["{quests.high_voltage.subtitle}"] title: "{quests.high_voltage}" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 0d57e51d7..7b2886226 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -409,8 +409,8 @@ type: "item" }] title: "{quests.steam_age.crushing_wheel.title}" - x: -19.5d - y: 18.0d + x: -21.5d + y: 10.5d } { dependencies: ["7DB7AB5349218605"] @@ -436,13 +436,13 @@ ] title: "{quests.steam_age.treated_planks.title}" x: -19.5d - y: 12.0d + y: 10.5d } { dependencies: [ - "246D2C5989E3E907" "233B414B4F189140" "781C6AD30194CB45" + "3E175E20C91F168B" ] description: ["{quests.steam_age.electron_tube.desc}"] id: "033E74BC588E7EAD" @@ -564,8 +564,8 @@ type: "item" }] title: "{quests.steam_age.mech_crafter.title}" - x: -19.5d - y: 17.0d + x: -20.5d + y: 12.0d } { dependencies: ["46FA9DD4755A5548"] @@ -828,9 +828,9 @@ } { dependencies: [ - "033E74BC588E7EAD" "5917B0D4708BF534" "6100B3C732E379AA" + "246D2C5989E3E907" ] description: ["{quests.steam_age.centrifuge.desc}"] id: "19A1D52A7F550478" @@ -842,8 +842,8 @@ type: "item" }] title: "{quests.steam_age.centrifuge.title}" - x: -18.0d - y: 17.0d + x: -20.5d + y: 10.5d } { dependencies: [ @@ -1593,7 +1593,7 @@ type: "checkmark" }] title: "{quests.steam_age.packager.title}" - x: -22.0d + x: -19.5d y: 17.0d } { diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 57b015c45..8f72f42c9 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -90,11 +90,7 @@ "item.gtceu.osmium_credit": "§732,768 Credits", "item.gtceu.naquadah_credit": "§7262,144 Credits", "item.gtceu.neutronium_credit": "§72,097,152 Credits", - "item.gtceu.treated_wood_plate": "Treated Medium Density Fiberboard", "item.gtceu.wood_plate": "Medium Density Fiberboard", - "item.gtceu.treated_wood_dust": "Treated Chipboard Composite", - "item.gtceu.small_treated_wood_dust": "Small Pile of Treated Chipboard Composite", - "item.gtceu.tiny_treated_wood_dust": "Tiny Pile of Treated Chipboard Composite", "material.gtceu.ice": "Ice Slush", "material.gtceu.damascus_steel": "Swine-steel", "material.gtceu.cooperite": "Cooperite", diff --git a/kubejs/assets/tfg/textures/item/high_density_treated_fiberboard.png b/kubejs/assets/tfg/textures/item/high_density_treated_fiberboard.png new file mode 100644 index 0000000000000000000000000000000000000000..061ecfa39d7f4688b99bb676b987b9fd71792ff8 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7UU<4VhFJ8To#f4Z$UvY) z-Lv-UG4ZAf0Y@8+fB*k0RD4%>~kN#soT6;G3CZ8rS1&1 zU;0dI{CT%7TO7KCk)flr|;dLSewEV3E&nR@%+1d?|fI*gbY0 zm)Fvbx93k*-*QV-Hg3^&;pB?PtvB|ueW@EE+&O#9e3&tFLW${d*%ecmIvryVw?on~&Tb&#{=X81GtP{pfzGE4!# ut|XU;IW8)&K4`m4IR3@=c+27gq8k^*yo;V3dY6HLfx*+&&t;ucLK6V@+j;;1 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/treated_chipboard_composite.png b/kubejs/assets/tfg/textures/item/treated_chipboard_composite.png new file mode 100644 index 0000000000000000000000000000000000000000..cf3386024ba9468c19485cec148bbf2c7d96597d GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7#XVgdLo9l?PWH`WaujLV zKTlrmt_t_t(#72@&p9>=6g3zuKg-D!S;5kKljY#mEqY4EEk`ONw_0eqO}Mga|DsiL zYx9EE1(nGDyU&(7&uixLqIbSUe0niGrd$s5mfwH%h$VI2smmIPFMcsZESBJ(G}*IH zh~>w*Z$G|d*XY{x29V8@Jk@2`M? sX@`c*;TEYPB^>`U3s$cC=d)kQvi#q)Q}1jU7#J8lUHx3vIVCg!03Fek { ], { A: 'gtceu:glass_tube', B: '#forge:bolts/steel', - C: 'gtceu:treated_wood_plate', + C: 'gtceu:wood_plate', D: 'gtceu:red_alloy_single_wire', E: '#forge:plates/wrought_iron', F: '#forge:tools/screwdrivers', @@ -931,7 +931,7 @@ const registerCreateRecipes = (event) => { event.recipes.createSequencedAssembly([ '2x create:electron_tube', - ], 'gtceu:treated_wood_plate', [ + ], 'gtceu:wood_plate', [ event.recipes.createDeploying('tfg:unfinished_electron_tube', ['tfg:unfinished_electron_tube', '#forge:plates/wrought_iron']), event.recipes.createDeploying('tfg:unfinished_electron_tube', ['tfg:unfinished_electron_tube', 'gtceu:red_alloy_single_wire']), event.recipes.createDeploying('tfg:unfinished_electron_tube', ['tfg:unfinished_electron_tube', 'gtceu:red_alloy_single_wire']), diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 03055afe0..2b09e8271 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -128,8 +128,9 @@ const registerGTCEURecipes = (event) => { event.recipes.tfc.barrel_sealed(2000) .outputItem('gtceu:treated_wood_dust') - .inputs('tfg:chipboard_composite', TFC.fluidStackIngredient('#forge:creosote', 50)) - .id('tfg:barrel/treated_chipboard_composite') + .inputs('#tfg:wood_dusts', TFC.fluidStackIngredient('#forge:creosote', 50)) + .id('tfg:barrel/treated_wood_dust') + //#endregion //#region Выход: Капля резины @@ -1426,5 +1427,9 @@ const registerGTCEURecipes = (event) => { event.replaceInput({ id: 'gtceu:shaped/large_combustion_engine' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') event.replaceInput({ id: 'gtceu:shaped/nano_chestplate_advanced' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') event.replaceInput({ id: 'gtceu:assembler/ev_large_miner' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + + //# Circuit Board + + event.replaceInput({ id: 'gtceu:assembler/phenolic_board' }, '#tfg:wood_dusts', 'tfg:high_density_treated_fiberboard') } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index e65392484..5e418a2f5 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -895,25 +895,45 @@ function registerGTCEuMachineRecipes(event) { .duration(10) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.chemical_bath('gtceu:treated_chipboard_composite') - .itemInputs('1x tfg:chipboard_composite') - .inputFluids(Fluid.of('gtceu:creosote', 50)) - .itemOutputs('gtceu:treated_wood_dust') - .duration(100) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('gtceu:wood_mdf') .itemInputs('1x tfg:chipboard_composite') .itemOutputs('gtceu:wood_plate') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('gtceu:treated_wood_mdf') - .itemInputs('1x gtceu:treated_wood_dust') - .itemOutputs('gtceu:treated_wood_plate') + event.recipes.gtceu.chemical_bath('gtceu:treated_chipboard_composite') + .itemInputs('1x tfg:chipboard_composite') + .inputFluids(Fluid.of('gtceu:creosote', 50)) + .itemOutputs('tfg:treated_chipboard_composite') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') + .itemInputs('1x gtceu:wood_plate') + .inputFluids(Fluid.of('gtceu:creosote', 50)) + .itemOutputs('tfg:high_density_treated_fiberboard') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') + .itemInputs('1x gtceu:wood_plate') + .inputFluids(Fluid.of('gtceu:creosote', 50)) + .itemOutputs('tfg:high_density_treated_fiberboard') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.compressor('tfg:chemical_treated_wood') + .itemInputs('#tfg:wood_dusts') + .itemOutputs('gtceu:treated_wood_dust') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.assembler('tfg:resin_circuit_assembler') + .itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin') + .itemOutputs('gtceu:resin_circuit_board') + .duration(20*10) + .EUt(GTValues.VA[GTValues.ULV]) + //#region New Casings event.recipes.gtceu.assembler('basic_solar_casing') diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 895467739..b668b69c1 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -642,17 +642,6 @@ function removeGTCEURecipes(event) { removeMaceratorRecipe(event, 'macerate_brick_wall') removeMaceratorRecipe(event, 'macerate_flower_pot') - removeMaceratorRecipe(event, 'macerate_treated_wood_fence_gate') - removeMaceratorRecipe(event, 'macerate_long_treated_wood_rod') - removeMaceratorRecipe(event, 'macerate_treated_wood_normal_fluid_pipe') - removeMaceratorRecipe(event, 'macerate_treated_wood_large_fluid_pipe') - removeMaceratorRecipe(event, 'macerate_treated_wood_small_fluid_pipe') - removeMaceratorRecipe(event, 'macerate_treated_wood_door') - removeMaceratorRecipe(event, 'macerate_treated_wood_frame') - removeMaceratorRecipe(event, 'macerate_treated_wood_fence') - removeMaceratorRecipe(event, 'macerate_treated_wood_boat') - removeMaceratorRecipe(event, 'macerate_treated_wood_chest_boat') - removeMaceratorRecipe(event, 'macerate_marble') event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__fireclay' }) @@ -725,7 +714,6 @@ function removeGTCEURecipes(event) { // Remove old treated plank and wood plank recipe event.remove({ id: 'gtceu:compressor/compress_plate_dust_wood' }) - event.remove({ id: 'gtceu:compressor/compress_plate_dust_treated_wood'}) // Remove Default Pressure Plate Recipes const MC_PRESSURE_PLATES = [ diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index f62501506..5831cf73a 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -56,6 +56,8 @@ const registerGTCEUItemTags = (event) => { event.remove('minecraft:planks', 'gtceu:treated_wood_planks') event.remove('minecraft:planks', 'gtceu:treated_wood_plate') + event.remove('minecraft:planks', 'gtceu:wood_plate') + event.add('tfg:sugars', 'minecraft:sugar') event.add('tfg:sugars', 'afc:birch_sugar') event.add('tfg:sugars', 'afc:maple_sugar') diff --git a/kubejs/startup_scripts/gtceu/items.js b/kubejs/startup_scripts/gtceu/items.js index b595c4f20..6b29ca59f 100644 --- a/kubejs/startup_scripts/gtceu/items.js +++ b/kubejs/startup_scripts/gtceu/items.js @@ -36,4 +36,10 @@ const registerGTCEuItems = (event) => { event.create('tfg:chipboard_composite') .translationKey('item.chipboard_composite') + event.create('tfg:treated_chipboard_composite') + .translationKey('item.treated_chipboard_composite') + + event.create('tfg:high_density_treated_fiberboard') + .translationKey('item.high_density_treated_fiberboard') + }