Merge branch 'TerraFirmaGreg-Team:main' into patch-5

This commit is contained in:
Pyritie 2025-01-09 23:09:24 +00:00 committed by GitHub
commit 8a7d15be6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
72 changed files with 4943 additions and 2077 deletions

View file

@ -33,6 +33,9 @@
{
"category": "emi:fuel"
},
{
"category": "gtceu:ore_vein_diagram"
},
{
"id": "/emi:/crafting/repairing/[^*]+/"
},

View file

@ -1,6 +1,6 @@
{
"name": "Ores in TFG",
"description": "TFG has its own ore generation system that's similar to TFC's with the huge but rare veins, but with multiple minerals per vein. This category lists all of the vein types and where to find them.",
"description": "TFG has its own ore generation system that's similar to TFC's with the huge but rare veins, but with multiple minerals per vein. This category lists all of the vein types and where to find them.$(br2)Veins are named after their most dominant ore, but most veins contain 3-5 minerals.$(br2)See also: $(l:the_world/geology)Geology$(), $(l:getting_started/finding_ores)Indicators$()",
"icon": "gtceu:raw_pyrite",
"sortnum": 60
}

View file

@ -6,6 +6,7 @@
[
{
"type": "patchouli:text",
"title": "Inventory Management",
"text": "So you've got a few $(l:getting_started/pottery#vessel)Vessels$() and you've made a few $(item)Wooden Chests$(), but you still have more items than you know what to do with. What's next?$(br2)A $(thing)Backpack$() can double your on-person inventory at base level, and further backpack upgrades increase it even more!"
},
{

View file

@ -6,6 +6,7 @@
[
{
"type": "patchouli:text",
"title": "Basic Automation",
"text": "Tired of making charcoal in huge pits? Once you've got $(l:mechanics/bloomery)Wrought Iron$(), you'll be able to make your first GregTech multiblock, the $(item)Coke Oven$().$(br)It will turn logs into $(thing)charcoal$() automatically, as well as upgrade any $(thing)Coal$() into $(thing)Coke$() which burns twice as long in a $(l:mechanics/charcoal_forge)Forge$().$(br)All recipes output $(thing)Creosote$(), which can be used as a lamp fuel and is required for $(l:mechanics/pumps)Create$()."
},
{

View file

@ -6,6 +6,7 @@
[
{
"type": "patchouli:text",
"title": "Getting Started With Create",
"text": "In TerraFirmaGreg, TFC's own mechanical power system has been replaced with $(thing)Create$().$(br2)You can make a few Create things once you have Wrought Iron, but you can only really get started once you have access to $(l:mechanics/steel)Steel$() and $(thing)Steam Machines$().$(br2)First, you will need a source of $(thing)Mechanical Power$(), either Water Wheels, Windmills, or a Steam Engine. Of these, $(thing)Water Wheels$() are the easiest to start with, just put them in a river!$(br)"
},
{

View file

@ -1,5 +1,5 @@
{
"name": "Amethyst",
"name": "Amethyst & Garnet",
"icon": "minecraft:amethyst_shard",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Opal",
"name": "Opal & Garnet",
"icon": "gtceu:opal_gem",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Hematite (Deep)",
"name": "Hematite, Goethite, & Ruby",
"icon": "gtceu:rich_raw_hematite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Goethite",
"name": "Goethite & Malachite",
"icon": "gtceu:rich_raw_goethite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Chromite",
"name": "Chromite & Magnetite",
"icon": "gtceu:rich_raw_chromite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,6 +1,6 @@
{
"name": "Molybdenum",
"icon": "gtceu:rich_raw_molybdenum",
"name": "Wulfenite & Molybdenite",
"icon": "gtceu:rich_raw_wulfenite",
"category": "tfc:tfg_ores",
"read_by_default": true,
"pages": [
@ -17,7 +17,7 @@
"pattern": [[ "0" ], [ " " ]]
},
"enable_visualize": false,
"text": "Percentage: 40%$(br)Source of: Lead, Molybdenum$(br)Formula: PbMoO₄"
"text": "Percentage: 40%$(br)Source of: Lead, Molybdenum$(br)Formula: PbMoO₄$(br)Hazardous: Yes"
},
{
"type": "patchouli:multiblock",

View file

@ -28,7 +28,7 @@
"pattern": [[ "0" ], [ " " ]]
},
"enable_visualize": false,
"text": "Percentage: 25%$(br)Source of: Plutonium$(br)Formula: Pu²³⁹"
"text": "Percentage: 25%$(br)Source of: Plutonium$(br)Formula: Pu²³⁹$(br)Hazardous: Yes"
}
]
}

View file

@ -1,5 +1,5 @@
{
"name": "Uraninite",
"name": "Uraninite & Pitchblende",
"icon": "gtceu:rich_raw_uraninite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Sapphire",
"name": "Sapphire & Almandine",
"icon": "gtceu:sapphire_gem",
"category": "tfc:tfg_ores",
"read_by_default": true,
@ -11,6 +11,7 @@
{
"type": "patchouli:multiblock",
"name": "Almandine",
"anchor": "almandine",
"multiblock":
{
"mapping": { "0": "#forge:ores/almandine" },
@ -22,6 +23,7 @@
{
"type": "patchouli:multiblock",
"name": "Pyrope",
"anchor": "pyrope",
"multiblock":
{
"mapping": { "0": "#forge:ores/pyrope" },

View file

@ -1,5 +1,5 @@
{
"name": "Sheldonite",
"name": "Sheldonite & Bornite",
"icon": "gtceu:rich_raw_platinum",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Topaz",
"name": "Topaz & Chalcocite",
"icon": "gtceu:topaz_gem",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -0,0 +1,63 @@
{
"name": "Dealing with Hazards",
"icon": "gtceu:hazmat_headpiece",
"category": "tfc:tfg_ores",
"priority": true,
"sortnum": 1,
"pages": [
{
"type": "patchouli:text",
"text": "Some ores are hazardous! Having them in your inventory will deal continuous poison damage.$(br2)There's a full $(thing)hazmat suit$(), but that's all the way in $(thing)MV$(), so what can you do instead?$(br2)Here's some tips until TFG is able to update to a newer version of a GregTech that provides its own primitive protection equipment."
},
{
"type": "patchouli:text",
"text": "Later, if you want to move hazardous materials around, you can take them out of small vessels and into chests and machines by $(thing)Right-clicking$() on the vessel. This way, it will never enter your inventory!$(br2)Lastly, if you don't enjoy hazards, you can turn them off in the GregTech options."
},
{
"type": "patchouli:spotlight",
"title": "Rocks",
"item": { "tag": "tfc:rock_knapping" },
"text": "The easiest way to prevent hazardous items from entering your inventory is to not pick them up at all.$(br)Filling your inventory with $(thing)Rocks$(), for example, will let you pick and choose which items you want to pick up, letting you deal with the hazardous ones all at once later."
},
{
"type": "patchouli:spotlight",
"title": "Containers",
"text": "As mentioned, the hazardous materials only deal damage while they are in your $(thing)inventory$(), but that doesn't apply to other containers!$(br)Hazardous materials will not deal damage while they are in another container such as a $(l:mechanics/crankshaft)Backpack$() or $(l:getting_started/pottery#vessel)Vessel$().",
"item": "sophisticatedbackpacks:backpack,tfc:ceramic/vessel,tfc:ceramic/large_vessel"
},
{
"type": "patchouli:spotlight",
"title": "Armor",
"text": "Better armor will reduce the damage taken from hazardous materials.",
"item": { "tag": "minecraft:trimmable_armor" }
},
{
"type": "patchouli:spotlight",
"title": "Spring Water",
"item": "tfc:bucket/spring_water",
"text": "Standing in $(thing)Spring Water$() will provide a slow $(thing)Regeneration$() effect."
},
{
"type": "patchouli:spotlight",
"title": "Aged Alcohol",
"text": "$(thing)Aged Alcohol$() will give potion buffs, some of which you might find useful.$(br2)You can drink them with a $(l:getting_started/pottery#jug)Jug$() or $(l:waterflasks/recipes)Flask$().",
"item": "tfcagedalcohol:bucket/aged_beer,tfcagedalcohol:bucket/aged_cider,tfcagedalcohol:bucket/aged_rum,tfcagedalcohol:bucket/aged_sake,tfcagedalcohol:bucket/aged_vodka,tfcagedalcohol:bucket/aged_whiskey,tfcagedalcohol:bucket/aged_corn_whiskey,tfcagedalcohol:bucket/aged_rye_whiskey"
},
{
"type": "patchouli:text",
"text": "Aged Beer: Absorption II (20:00)$(br2)Aged Cider: Speed (5:20)$(br2)Aged Rum: Speed II (2:40)$(br2)Aged Sake: Resistance (5:20)$(br2)Aged Vodka: Resistance II (2:40)$(br2)Aged Corn Whiskey: Haste (5:20)$(br2)Aged Rye Whiskey: Haste (5:20)$(br2)Aged Whiskey: Haste II (2:40)"
},
{
"type": "patchouli:spotlight",
"item": { "tag": "tfc:foods" },
"title": "Nutrition",
"text": "Eating better foods with more $(l:getting_started/food_and_water#nutrients)nutrition$() will raise your maximum HP by a significant amount.$(br2)$(l:mechanics/pot#soup)Soups$(), $(l:mechanics/sandwiches)Sandwiches$(), and $(l:mechanics/salad)Salads$() are great for this."
},
{
"type": "patchouli:spotlight",
"title": "Bed",
"item": { "tag": "minecraft:beds" },
"text": "If all else fails, bringing along a bed to respawn is a good idea.$(br2)If you don't have access to $(thing)Wool$() or $(thing)String$(), you can also make a $(l:getting_started/a_place_to_sleep)Thatch Bed$()."
}
]
}

View file

@ -1,5 +1,5 @@
{
"name": "Phosphorus",
"name": "Apatite & Pyrochlore",
"icon": "gtceu:raw_apatite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Bauxite",
"name": "Bauxite & Ilmenite",
"icon": "gtceu:raw_bauxite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Copper",
"name": "Copper & Chalcopyrite",
"icon": "minecraft:raw_copper",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Garnierite & Cobalt",
"name": "Garnierite & Cobaltite",
"icon": "gtceu:raw_garnierite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Gold (Normal)",
"name": "Gold, Limonite, & Hematite",
"icon": "minecraft:raw_gold",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Hematite (Normal)",
"name": "Hematite & Limonite",
"icon": "gtceu:raw_hematite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Lapis",
"name": "Lapis, Lazurite, & Sodalite",
"icon": "minecraft:lapis_lazuli",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Lubricant",
"name": "Soapstone, Talc, & Trona",
"icon": "gtceu:raw_soapstone",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Magnetite",
"name": "Magnetite & Vanadium",
"icon": "gtceu:raw_magnetite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Mica",
"name": "Kyanite, Mica, & Bauxite",
"icon": "gtceu:raw_mica",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Monazite & Rare Earth",
"name": "Bastnasite & Monazite",
"icon": "gtceu:monazite_gem",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Magnesium & Olivine",
"name": "Bentonite & Olivine",
"icon": "gtceu:olivine_gem",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Redstone",
"name": "Redstone, Cinnabar, & Ruby",
"icon": "minecraft:redstone",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Saltpeter",
"name": "Saltpeter & Electrotine",
"icon": "gtceu:raw_saltpeter",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Silver & Lead",
"name": "Silver, Galena, & Lead",
"icon": "gtceu:raw_silver",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Sphalerite (Normal)",
"name": "Sphalerite & Pyrite",
"icon": "gtceu:raw_sphalerite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Spodumene",
"name": "Spodumene & Lepidolite",
"icon": "gtceu:raw_spodumene",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,5 +1,5 @@
{
"name": "Sulfur",
"name": "Sulfur & Pyrite",
"icon": "gtceu:raw_sulfur",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,28 +1,29 @@
{
"name": "Mining in TFG",
"icon": "gtceu:pyrite_dust",
"category": "tfc:tfg_ores",
"priority": true,
"pages": [
{
"type": "patchouli:text",
"text": "There are two ways of mining ores - with a $(thing)Pickaxe$(), or with a $(thing)Hammer$().$(br)Generally, you should mine anything meltable (such as $(thing)Copper$()) with a hammer, and everything else with a pickaxe, but check JEI if you're unsure."
},
{
"type": "patchouli:spotlight",
"title": "Pickaxe",
"text": "Breaking an ore block with a pickaxe will yield $(thing)Raw$() ores (poor, normal, or rich), as well as some stone dust. These are not worth much mB each and you will need multiple to make a single ingot, however some other minerals are only useable in this state, such as $(thing)Coal$().",
"item": {
"tag": "minecraft:pickaxes"
}
},
{
"type": "patchouli:spotlight",
"title": "Hammer",
"text": "Breaking an ore block with a hammer will yield 1-2 $(thing)Crushed Ores$(). These already melt into more mB than Raw ores, but with a little $(l:tfg_ores/ore_basics#processing)extra processing$() they can be worth even more!",
"item": {
"tag": "forge:tools/hammers"
}
{
"name": "Mining in TFG",
"icon": "gtceu:pyrite_dust",
"category": "tfc:tfg_ores",
"priority": true,
"sortnum": 0,
"pages": [
{
"type": "patchouli:text",
"text": "There are two ways of mining ores - with a $(thing)Pickaxe$(), or with a $(thing)Hammer$().$(br)Generally, you should mine anything meltable (such as $(thing)Copper$()) with a hammer, and everything else with a pickaxe, but check JEI if you're unsure."
},
{
"type": "patchouli:spotlight",
"title": "Pickaxe",
"text": "Breaking an ore block with a pickaxe will yield $(thing)Raw$() ores (poor, normal, or rich), as well as some stone dust. These are not worth much mB each and you will need multiple to make a single ingot, however some other minerals are only useable in this state, such as $(thing)Coal$().",
"item": {
"tag": "minecraft:pickaxes"
}
},
{
"type": "patchouli:spotlight",
"title": "Hammer",
"text": "Breaking an ore block with a hammer will yield 1-2 $(thing)Crushed Ores$(). These already melt into more mB than Raw ores, but with a little $(l:tfg_ores/ore_basics#processing)extra processing$() they can be worth even more!",
"item": {
"tag": "forge:tools/hammers"
}
},
{
"type": "patchouli:spotlight",
@ -52,7 +53,7 @@
},
{
"type": "patchouli:text",
"text": "Later, when you're in LV, check the LV quests to learn about all the different ore processing machines and extra byproducts they can give you. Remember the $(thing)Macerator$() does not give byproducts until $(thing)HV$()!$(br2)Here's a $(l:https://docs.google.com/spreadsheets/d/1P3Baz4y5vgJ3XrCoNs4l3BXGPiFEPlW7i4taPEWpTB4/edit?usp=sharing)Spreadsheet$() if you prefer to see this section's ore generation data that way."
}
]
}
"text": "Later, when you're in LV, check the LV quests to learn about all the different ore processing machines and extra byproducts they can give you. Remember the $(thing)Macerator$() does not give byproducts until $(thing)HV$()!"
}
]
}

View file

@ -54,7 +54,7 @@
},
{
"type": "patchouli:text",
"text": "If you're having trouble finding Realgar, another source of Arsenic is $(thing)Cobaltite$() (found in $(l:tfg_ores/normal_garnierite)Garnierite veins$()), although it will require an $(thing)Electric Blast Furnace$() to process."
"text": "If you're having trouble finding Realgar, another source of Arsenic is $(l:tfg_ores/normal_garnierite)Cobaltite$(), although it will require an $(thing)Electric Blast Furnace$() to process."
}
]
}

View file

@ -1,5 +1,5 @@
{
"name": "Sphalerite (Surface)",
"name": "Sphalerite & Sulfur",
"icon": "gtceu:poor_raw_sphalerite",
"category": "tfc:tfg_ores",
"read_by_default": true,

View file

@ -1,80 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"name": "Доменная печь",
"category": "tfc:mechanics",
"icon": "tfc:bloomery",
"pages": [
{
"type": "patchouli:text",
"text": "$(thing)Доменная печь$() используется для плавки $(thing)Железной руды$() в $(thing)Железные слитки$(), которые могут быть обработаны в $(thing)Кованое железо$(). Железные руды это $(l:the_world/ores_and_minerals#hematite)гематит$(), $(l:the_world/ores_and_minerals#limonite)лимонит$() и $(l:the_world/ores_and_minerals#magnetite)магнетит$(). Эти руды плавятся в $(thing)Чугун$(), а не в $(thing)Кованое железо$(). Все предметы, содержащие железо, плавятся в чугун. Чтобы превратить их в используемое железо, необходима доменная печь. Любой железный предмет может быть использован в доменной печи, включая железные инструменты и чугунные слитки!"
},
{
"type": "patchouli:crafting",
"recipe": "tfc:crafting/bloomery",
"text": "Доменная печь сделана из 8 $(thing)Бронзовых двойных листов$()."
},
{
"type": "patchouli:multiblock",
"multiblock_id": "tfc:bloomery",
"name": "Сыродутный горн",
"text": "Доменная печь минимального размера. Блок доменной печи открывается и закрывается с помощью $(item)$(k:key.use)$().",
"enable_visualize": true
},
{
"type": "patchouli:text",
"text": "Сыродутный горн может содержать до 48 $(thing)входящих предметов$(), с 16 предметами каждого типа на слой трубы. Чтобы добавить слои к трубе, сложите два дополнительных слоя каменных блоков.$(br2)Чтобы добавить предметы в горн, поднимитесь наверх и бросьте предметы внутрь. Должна сформироваться башня из серой руды."
},
{
"type": "patchouli:image",
"images": [
"tfc:textures/gui/book/tutorial/bloomery_hole.png"
],
"text": "Добавление предметов в сыродутный горн.",
"border": true
},
{
"type": "patchouli:text",
"text": "Сыродутный горн потребляет $(thing)1 угля$() и $(thing)144 мБ чугуна$(), чтобы произвести одну $(thing)крица$(). После заполнения горна комбинацией $(thing)угля$() и $(thing)руды$(), зажгите блок горна и подождите 15 часов, пока руда плавится. Когда горн погаснет, он оставит блок $(thing)крицы$(). Он содержит $(thing)сырую железную крицу$(), которую можно добыть, дробя $(thing)крицу$() киркой."
},
{
"type": "patchouli:multiblock",
"multiblock": {
"pattern": [
[
"X"
],
[
"0"
]
],
"mapping": {
"X": "tfc:bloom[layers=8]"
}
},
"name": "Блок слитка",
"text": "Большая $(thing)крица$().",
"enable_visualize": false
},
{
"type": "tfc:anvil_recipe",
"recipe": "tfc:anvil/refined_iron_bloom",
"text": "$(thing)Сырой железный слиток$() должен быть обработан на $(l:mechanics/anvils)наковальне$(), чтобы сделать $(thing)Очищенный железный слиток$()."
},
{
"type": "tfc:anvil_recipe",
"recipe": "tfc:anvil/metal/ingot/wrought_iron",
"text": "$(thing)Очищенный железный слиток$() должен быть обработан на $(l:mechanics/anvils)наковальне$(), чтобы сделать $(thing)Кованые железные слитки$()."
},
{
"type": "patchouli:text",
"text": "$(li)Если в сыродутном горне окажется больше предметов, чем он может вместить на основе своего дымохода, он попытается вытолкнуть их наружу.$()$(li)Чтобы забрать свои предметы из незажженного горна, не ломайте башню из расплавленных блоков. Сломайте блок сыродутного горна.$()$(li)Слитки будут плавиться только в чугун, а не в кованое железо. Их нужно обрабатывать!$()",
"title": "Заметки кузнеца"
}
],
"read_by_default": true,
"extra_recipe_mappings": {
"tfc:bloom": 6,
"tfc:raw_iron_bloom": 7,
"tfc:refined_iron_bloom": 8
}
}