diff --git a/config/ftbquests/quests/chapters/ore_processing.snbt b/config/ftbquests/quests/chapters/ore_processing.snbt index 97ac21185..5c7500e19 100644 --- a/config/ftbquests/quests/chapters/ore_processing.snbt +++ b/config/ftbquests/quests/chapters/ore_processing.snbt @@ -585,7 +585,7 @@ type: "checkmark" } ] - title: "{quests.ore_proc.macerator_separator.desc}" + title: "{quests.ore_proc.macerator_separator.title}" x: -1.0d y: 1.0d } diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 4ecf2351a..284f43c5c 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -586,7 +586,7 @@ tasks: [ { dimension: "minecraft:the_nether" - icon: "minecraft:netherrack" + icon: "minecraft:deepslate" id: "42372A0532A8AEDC" title: "{quests.metal_age.beneath_kaolin.task}" type: "dimension" @@ -858,7 +858,7 @@ tasks: [ { dimension: "minecraft:the_nether" - icon: "minecraft:netherrack" + icon: "minecraft:deepslate" id: "77162ADDC8732968" title: "{quests.metal_age.beneath_graphite.task}" type: "dimension" @@ -1308,4 +1308,4 @@ ] subtitle: ["{quests.metal_age.subtitle}"] title: "{quests.metal_age}" -} \ No newline at end of file +} diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index e6c121a2c..29d5fa410 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -10,8 +10,8 @@ { id: "39027CF4DC307D33" linked_quest: "5E186CD5E83BFDF0" - x: -27.5d - y: -3.0d + x: -27.0d + y: 2.0d } { id: "0CE64B9914191C56" @@ -31,8 +31,8 @@ linked_quest: "48A8E3210B2BAE1C" shape: "octagon" size: 2.0d - x: -27.5d - y: -5.0d + x: -27.0d + y: 0.0d } ] quests: [ @@ -48,7 +48,7 @@ }] title: "{quests.steam_age.basic_millstone.title}" x: -18.0d - y: -5.0d + y: -2.0d } { dependencies: ["6F1BC99BE641B671"] @@ -66,7 +66,7 @@ }] title: "{quests.steam_age.horse_crank.title}" x: -22.0d - y: -5.0d + y: -2.0d } { dependencies: ["7B045998769930F0"] @@ -80,8 +80,8 @@ type: "item" }] title: "{quests.steam_age.helve_hammer.title}" - x: -20.0d - y: -1.0d + x: -18.0d + y: -4.0d } { dependencies: ["6F1BC99BE641B671"] @@ -109,7 +109,7 @@ ] title: "{quests.steam_age.basic_greate.title}" x: -20.0d - y: -3.0d + y: -4.0d } { dependencies: ["0D0D461AE3A3F7BF"] @@ -131,7 +131,7 @@ ] title: "{quests.steam_age.water_wheel.title}" x: -14.5d - y: -3.0d + y: 0.0d } { dependencies: ["0D0D461AE3A3F7BF"] @@ -153,7 +153,7 @@ ] title: "{quests.steam_age.windmill.title}" x: -14.5d - y: -7.0d + y: -4.0d } { dependencies: ["6E8CEE02CB5B678B"] @@ -168,7 +168,7 @@ }] title: "{quests.steam_age.metal_casing.title}" x: -9.5d - y: -5.0d + y: -2.0d } { dependencies: ["09D913288896A67A"] @@ -181,8 +181,8 @@ type: "item" }] title: "{quests.steam_age.steel_encased_fan.title}" - x: -4.5d - y: -1.0d + x: -5.5d + y: 4.0d } { dependencies: ["09D913288896A67A"] @@ -201,8 +201,8 @@ type: "item" }] title: "{quests.steam_age.steel_pump.title}" - x: -2.5d - y: -3.0d + x: -3.5d + y: 2.0d } { dependencies: ["209958FE2EEA5D72"] @@ -265,7 +265,7 @@ }] title: "{quests.steam_age.mechanical_saw.title}" x: -9.5d - y: -3.0d + y: 0.0d } { dependencies: ["7F14D2A34F480ACA"] @@ -279,7 +279,7 @@ }] title: "{quests.steam_age.mechanical_harvester.title}" x: -9.5d - y: -7.0d + y: -4.0d } { dependencies: ["6E8CEE02CB5B678B"] @@ -307,7 +307,7 @@ ] title: "{quests.steam_age.chute.title}" x: -12.0d - y: -3.0d + y: 0.0d } { dependencies: ["51CBF7378FFAD514"] @@ -324,8 +324,8 @@ type: "item" }] title: "{quests.steam_age.mold_table.title}" - x: -2.5d - y: -1.0d + x: -3.5d + y: 4.0d } { dependencies: ["32046292AA5B0E30"] @@ -352,8 +352,8 @@ } ] title: "{quests.steam_age.steel_greate.title}" - x: -4.5d - y: -3.0d + x: -5.5d + y: 2.0d } { dependencies: ["09D913288896A67A"] @@ -367,8 +367,8 @@ type: "item" }] title: "{quests.steam_age.steel_millstone.title}" - x: -6.5d - y: -3.0d + x: -7.5d + y: 2.0d } { dependencies: ["5917B0D4708BF534"] @@ -617,7 +617,7 @@ }] title: "{quests.steam_age.item_pipes.title}" x: -12.0d - y: -1.0d + y: 2.0d } { dependencies: [ @@ -1038,8 +1038,8 @@ } ] title: "{quests.steam_age.fluid_pipes.title}" - x: -2.5d - y: -5.0d + x: -3.5d + y: 0.0d } { dependencies: ["51CBF7378FFAD514"] @@ -1064,8 +1064,8 @@ type: "item" }] title: "{quests.steam_age.fluid_drums.title}" - x: -0.5d - y: -3.0d + x: -1.5d + y: 2.0d } { dependencies: ["49896161B31DB7B4"] @@ -1122,7 +1122,7 @@ ] title: "{quests.steam_age.create_tools.title}" x: -18.0d - y: -3.0d + y: 0.0d } { dependencies: ["6AA07588374B59AB"] @@ -1234,7 +1234,7 @@ ] title: "{quests.steam_age.poor_paths.title}" x: -23.5d - y: -6.5d + y: -3.5d } { dependencies: ["1059288C22CB56BB"] @@ -1285,7 +1285,7 @@ ] title: "{quests.steam_age.normal_paths.title}" x: -24.0d - y: -5.0d + y: -2.0d } { dependencies: ["1059288C22CB56BB"] @@ -1338,7 +1338,7 @@ ] title: "{quests.steam_age.good_paths.title}" x: -23.5d - y: -3.5d + y: -0.5d } { dependencies: [ @@ -1399,7 +1399,7 @@ }] title: "{quests.metal_age.bronze_goodies.title}" x: -20.0d - y: -5.0d + y: -2.0d } { description: ["{quests.metal_age.wrought_iron_goodies.desc}"] @@ -1423,7 +1423,7 @@ }] title: "{quests.metal_age.wrought_iron_goodies.title}" x: -12.0d - y: -5.0d + y: -2.0d } { description: ["{quests.metal_age.steel_goodies.desc}"] @@ -1446,8 +1446,8 @@ type: "item" }] title: "{quests.metal_age.steel_goodies.title}" - x: -4.5d - y: -5.0d + x: -5.5d + y: 0.0d } { dependencies: ["46FA9DD4755A5548"] @@ -1574,7 +1574,32 @@ ] title: "{quests.metal_age.coke_oven.title}" x: -14.5d - y: -5.0d + y: -2.0d + } + { + dependencies: ["49896161B31DB7B4"] + description: [ + "There is currently a bug with the Mechanical Mixer where some recipes want an actual Programmed Circuit item." + "For the time being, you can craft these out of Sticks." + "" + "This will be fixed whenever we're able to update Greate to the latest version, which requires Create 6, which requires other Create addons to be updated... hopefully that should be soon." + ] + icon: { + Count: 1 + id: "gtceu:programmed_circuit" + tag: { + Configuration: 0 + } + } + id: "6068BC1F6917A69D" + size: 1.0d + tasks: [{ + id: "385A0D77B9B4AA74" + type: "checkmark" + }] + title: "Bug workaround" + x: -5.5d + y: 13.5d } ] subtitle: ["{quests.steam_age.subtitle}"] diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index c66c7e6ee..372346e1a 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -2294,4 +2294,4 @@ ] subtitle: ["{quests.stone_age.subtitle}"] title: "{quests.stone_age}" -} \ No newline at end of file +} diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 15e80bfc4..d386d5b51 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -9,8 +9,8 @@ quest_links: [{ id: "1AD1F9822B738105" linked_quest: "2E36E5755B2F551C" - x: 4.0d - y: 6.0d + x: 6.0d + y: 5.0d }] quests: [ { @@ -2360,7 +2360,7 @@ ] title: "{quests.tfg_tips.lamps.title}" x: -5.0d - y: 11.0d + y: 11.5d } { dependencies: [ @@ -2395,7 +2395,7 @@ ] title: "{quests.tfg_tips.lava_lamp.title}" x: -5.0d - y: 12.5d + y: 13.0d } { dependencies: ["037CDA933FBE2CBE"] @@ -2416,7 +2416,7 @@ }] title: "{quests.tfg_tips.creosote.title}" x: -6.0d - y: 12.0d + y: 12.5d } { dependencies: ["037CDA933FBE2CBE"] @@ -2437,7 +2437,7 @@ }] title: "{quests.tfg_tips.olive_oil.title}" x: -4.0d - y: 12.0d + y: 12.5d } { dependencies: ["2D959136A5FC5F46"] @@ -2472,7 +2472,7 @@ ] title: "{quests.tfg_tips.glass_blocks.title}" x: -3.0d - y: 11.0d + y: 11.5d } { dependencies: ["150B7C5CD152E1BA"] @@ -3275,8 +3275,8 @@ type: "item" }] title: "{quests.tfg_tips.camera_attachments.title}" - x: -9.5d - y: 4.5d + x: -10.5d + y: 5.0d } { dependencies: ["275C8EA942AB49DD"] @@ -3296,11 +3296,11 @@ type: "item" }] title: "{quests.tfg_tips.filters.title}" - x: -9.5d - y: 5.5d + x: -10.5d + y: 6.0d } { - dependencies: ["4E2C1CAD883EB032"] + dependencies: ["275C8EA942AB49DD"] description: ["{quests.tfg_tips.interplanar_projector.desc}"] id: "3952D56556B35FDB" subtitle: "{quests.tfg_tips.interplanar_projector.subtitle}" @@ -3316,8 +3316,8 @@ type: "item" }] title: "{quests.tfg_tips.interplanar_projector.title}" - x: -9.5d - y: 6.5d + x: -10.5d + y: 7.0d } { dependencies: ["79FA776C414AE8E5"] @@ -3524,7 +3524,7 @@ }] title: "{quests.tfg_tips.tallow.title}" x: -6.5d - y: 11.0d + y: 11.5d } { dependencies: ["150B7C5CD152E1BA"] @@ -4710,7 +4710,7 @@ type: "item" }] title: "GregTech Storage" - x: 5.0d + x: 6.0d y: 7.0d } { @@ -4727,7 +4727,7 @@ type: "item" }] title: "Tape for Crate" - x: 5.0d + x: 6.0d y: 8.0d } ] diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index cfce3d307..16d32b372 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -53,6 +53,7 @@ "item.gtceu.iron_hex_cable": "16x Cast Iron Cable", "item.gtceu.ice_bucket": "Ice Water Bucket", "material.gtceu.ice": "Ice Water", + "material.gtceu.cooperite": "Cooperite", "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/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json index 5f3ef8818..97cd1a423 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json @@ -18,11 +18,11 @@ { "type": "patchouli:text", "title": "Trade Results", - "text": "$(li)3-9 String$(li)6-12 Sticks$(li)4-8 Charcoal$(li)5-12 Nether Quartz$(li)1-3 Tin Ingots$(li)1-3 Copper Ingots$(li)1-2 Leather$(li)8-12 Pyroxenite Bricks$(li)8-12 Migmatite Bricks" + "text": "$(li)1 Copper Ingot$(li)1 Tin Ingot$(li)1 Silver Ingot$(li)1 Bronze Ingot$(li)1 Bismuth Bronze Ingot$(li)1 Cast Iron Ingot$(li)1 Zinc Ingot$(li)1 Brass Ingot$(li)1 Bismuth Ingot$(li)1 Nickel Ingot$(li)4-6 Sulfur Powder" }, { "type": "patchouli:text", - "text": "$(li)6-12 Arrows$(li)4-12 Flux$(li)1-2 Raw Graphite$(li)4-8 Sulfur Powder$(li)2-4 Kaolin Clay$(li)4-8 Mangrove Lumber$(li)2-4 Mangrove Logs$(li)2-4 Cooked Venison$(li)8-16 Glow Berries$(li)2-4 Ghost Peppers$(li)2-4 Glowstone Dust" + "text": "$(li)1-2 Leather$(li)6-12 String$(li)6-12 Nether Quartz$(li)12-18 Mangrove Lumber$(li)6-8 Mangrove Logs$(li)4-6 Cooked Venison$(li)4-6 Ghost Peppers$(li)4-6 Gunpowder$(li)4-8 Charcoal$(li)6-12 Arrows$(li)6-12 Flux$(li)8-12 Blackstone Bricks$(li)8-12 Deepslate Bricks$(li)8-16 Sticks" }, { "type": "patchouli:text", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 3cbf08f92..e056a635f 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -177,7 +177,6 @@ "item.tfg.redblu_steel_hull_reinforcement": "Red & Blue Steel Hull Reinforcement", "item.tfg.aluminium_hull_reinforcement": "Aluminium Hull Reinforcement", "item.tfg.stainless_steel_hull_reinforcement": "Stainless Steel Hull Reinforcement", - "item.tfg.titanium_hull_reinforcement": "Titanium Hull Reinforcement", "item.tfg.flint_arrow_head": "Flint Arrow Head", "item.tfg.fletching": "Fletching", "item.tfg.phantom_silk": "Phantom Silk", @@ -192,6 +191,16 @@ "item.tfg.fishing_net.cupronickel": "Cupronickel Fishing Net", "item.tfg.fishing_net.tin_alloy": "Tin Alloy Fishing Net", "item.tfg.fishing_net.magnalium": "Magnalium Fishing Net", + "item.ulv_universal_circuit": "ULV Universal Circuit", + "item.lv_universal_circuit": "LV Universal Circuit", + "item.mv_universal_circuit": "MV Universal Circuit", + "item.hv_universal_circuit": "HV Universal Circuit", + "item.ev_universal_circuit": "EV Universal Circuit", + "item.iv_universal_circuit": "IV Universal Circuit", + "item.luv_universal_circuit": "LuV Universal Circuit", + "item.zpm_universal_circuit": "ZPM Universal Circuit", + "item.uv_universal_circuit": "UV Universal Circuit", + "item.uhv_universal_circuit": "UHV Universal Circuit", "material.tfg.latex": "Latex", "material.tfg.vulcanized_latex": "Vulcanized Latex", "material.tfg.fluix": "Fluix", @@ -519,7 +528,7 @@ "quests.low_voltage.lv_steam_turbine.desc.2": "If you're using a single &3Steam Turbine&r, you only need &a1x Tin Cables&r. On the other hand, if you upgrade to &32 Steam Turbines&r, you should use &a2x Tin Cables&r - else they may end up &cburning&r.\n\nThis is because of the &9Amperage&r mechanic... but that will be explained later so you can enjoy playing. Don't worry!", "quests.low_voltage.lbb.title": "Large Bronze Boiler", "quests.low_voltage.lbb.subtitle": "Boom, boom, boom, boom", - "quests.low_voltage.lbb.desc.1": "Be wary this one explodes if running when you load your world, waiting for a fix from GTm devs/n&oThe &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this will be your first port-of-call. Other power options are listed in the &bMV&r chapter.\n\n&cImportant:&r This Boiler &lCAN&r also &cexplode&r similarly to the regular Boilers! Usually, the explosion can be rather devastating...", + "quests.low_voltage.lbb.desc.1": "&cBe wary this one explodes if running when you load your world, waiting for a fix from GTm devs&r\n\n&oThe &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this will be your first port-of-call. Other power options are listed in the &bMV&r chapter.\n\n&cImportant:&r This Boiler &lCAN&r also &cexplode&r similarly to the regular Boilers! Usually, the explosion can be rather devastating...", "quests.low_voltage.lbb.desc.2": "&cWater supply is &lcrucial&r&r. Dedicate a system only for it.\n\nOnce fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. In TerraFirmaGreg we advise &8Creosote&r or &cLava&r. You can use Create to bring that if needed...", "quests.low_voltage.lbb.desc.3": "&5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25% power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\n&9Note:&r An in-depth tutorial about Multiblocks is given after you get the &3Electric Blast Furnace&r. We recommend you aim for that first.", "quests.low_voltage.lv_polariser.title": "Basic Polariser", @@ -725,6 +734,18 @@ "quests.low_voltage.mv_hull.subtitle": "This is going quite well, only 7 to go!", "quests.low_voltage.mv_hull.desc1": "Good job, you now have your &bMV Machine Hull&r, your first &bMV Circuit&r and your first &6Circuit Assembler&r.\n\nThis is the gist of &6Gregtech&r, every tier you are going to need to do new &6machines&r using new &6materials&r and &6chemicals&r. You are going to have so &5much fun&r, we are kinda jealous.", "quests.low_voltage.mv_hull.desc2": "Before going further into &bMV&r remember that in &6TFG&r you can use &6Create&r to reinforce your infrastruce if you don't want to use too much of Gregtech.", + "quests.medium_voltage.mv_machine_hull.title": "Welcome to MV!", + "quests.medium_voltage.mv_machine_hull.subtitle": "More technology, more problems", + "quests.medium_voltage.mv_machine_hull.desc": "Congrats on reaching MV!\n\nThis is when you'll start getting into more of GregTech's chemistry. Your main goals for MV are making your first plastic, automating a denser and more efficient fuel source, and upgrading your circuits and EBF.", + "quests.medium_voltage.mv_machine_hull.task": "", + "quests.medium_voltage.mv_.title": "", + "quests.medium_voltage.mv_.subtitle": "", + "quests.medium_voltage.mv_.desc": "", + "quests.medium_voltage.mv_.task": "", + "quests.medium_voltage.END.title": "", + "quests.medium_voltage.END.subtitle": "", + "quests.medium_voltage.END.desc": "", + "quests.medium_voltage.END.task": "", "quests.metal_age": "Metallurgy Age", "quests.metal_age.subtitle": "Your First Technological Advancements.", "quests.metal_age.weld_bronze_ingots.title": "Welding Bronze", @@ -857,6 +878,78 @@ "quests.metal_age.this_is_a_bucket.title": "This... is a Bucket.", "quests.metal_age.this_is_a_bucket.subtitle": "Dear God...", "quests.metal_age.this_is_a_bucket.desc": "Congratulations on crafting the Bucket. The Metallurgy Age is officially over.\n\nGo and start working on those Low Voltage components!", + "quests.ore_proc": "Ore Processing", + "quests.ore_proc.subtitle": "Everything you'll need to get the most out of your ores", + "quests.ore_proc.native_ore.title": "Welcome to Ore Processing", + "quests.ore_proc.native_ore.subtitle": "To Process, Ore Not To Process", + "quests.ore_proc.native_ore.desc": "An important part of &6Gregtech&r is its &dOre Processing Mechanics&r, but it can get pretty complicated, so this chapter is here to help!\n\nTo start with, you should be aware of the &6Ore Processing Diagram&r tab in EMI - Press the Show Uses key (default \"U\") on any item related to ore processing and look for the tab with the vanilla Iron Ore icon. This diagram may look overwhelming at first, but we'll take it step by step.\n\nA major part of GregTech philosophy is that there's not just one way to solve a problem, so take everything in this chapter as just a suggestion! We encourage you to customize your ore processing as you see fit.", + "quests.ore_proc.native_ore.task": "I agree to not just dump everything in a furnace", + "quests.ore_proc.ae2.title": "AE2 can help you", + "quests.ore_proc.ae2.subtitle": "A tag storage bus? What's that?", + "quests.ore_proc.ae2.desc": "If you like spaghetti only with &4tomato sauce&r we got you. With &6AE2&r no more pipes and filters everywhere simply the power of &dTag Storage Bus&r, Interface and &3Subnet&r.\n\nWe sure you know what's an interface but do you know what is the &dTag Storage Bus&r? Basically it's a Storage Bus that exports items by &6tag&r and not specific filter. So if you want a storage bus exporting only your purified ores it's easy just type '&5#forge:purified_ores*&r' or '&5*purified_ores*&r' in it. Obviouly there is other possibilities that we will let you explore. If you want to know the tag of an item, put it in main and type &6/kubejs hand&r\n\nAbout &3subnet&r we won't explain everything here but know atleast this, if you put a &6storage bus&r on an &2interface&r it will seperate the network. The &6storage bus side of the network&r will be able to look into the &2interface side of the newtork&r but &4not the other way around&r. That can be very useful so your ore processing isn't clogging your main storage or to split different processing.", + "quests.ore_proc.robot_arm.title": "Gregtech has the tools", + "quests.ore_proc.robot_arm.subtitle": "A robot arm sending excatly 4 small dusts filtered by tag?", + "quests.ore_proc.robot_arm.desc": "As always Gregtech has some pretty crazy tools to help you manage your logistic. You should already know about the &6Robot Arm&r and if you didn't use it yet for your &bVacuum Freezer&r we introduce you to the &6tag filter&r.\n\nIt's a filter for which you don't specify the item but use a tag or a combinaison of tag, you can refer to the explanation in the AE2 quest of this chapter for more.\n\nThe last one we want to introduce is the &4Smart Filter&r, this crazy one is able to filter items depending of a &6recipe&r. If you slap it on a robot arm itself slapped on an electrolyzer and set the robot arm to supply exact. It will supply the exact amount needed for the recipe?", + "quests.ore_proc.gtcy.title": "Ore Processing but Bigger", + "quests.ore_proc.gtcy.subtitle": "Who said size don't matter", + "quests.ore_proc.gtcy.desc": "As we said &6Ore Processing&r is a big part of &dGregtech&r and to help you without having to build milions of machines you can use the &bLarge Gregtech Machines&r. They do the exact same recipes but as they are multiblock you can chose the &6energy hatches&r and add a &6Parallel Hatch&r so they work faster\n\nAll of them are gated behind the &bAlloy Blast Smelter&r as it's the only multiblock able to create the alloys you need for every casing needed for these multiblocks. You will get more information on that within the &dEV&r chapter.", + "quests.ore_proc.macerator_byproduct.title": "Getting byproduct from crushing", + "quests.ore_proc.macerator_byproduct.subtitle": "I can get even more from my ores!", + "quests.ore_proc.macerator_byproduct.desc": "When looking at &bEMI&r you certainly already realized that your &dMacerator&r or &dCrushing Wheels&r have more &boutputs&r that what you actually get.\n\nThere is a reason for that and it's due to the fact that these &bextra outputs&r are gated behind &6HV&r. So basically whenever you can use either the &6HV macerator&r or the &6HU crushing wheels&r go for it.\n\nAlso you can see the &dMillstone&r in &bEMI&r but you cannot craft its &6HV&r version so that's why you don't see it here.", + "quests.ore_proc.macerator_noproduct.title": "Crushing for the poors", + "quests.ore_proc.macerator_noproduct.subtitle": "With these no byproduct", + "quests.ore_proc.macerator_noproduct.desc": "At the very beginning of &6TerraFirmaCraft&r you gonna use a &bPit Kiln&r to melt your raw ores into tools but that's the least efficient method. As soon as possible we advise you to use the &bQuern&r to get crushed ores. When you unlock &6Create&r you first machine should be the &bMillstone&r so atleast you can automate it with &bChute&r.\n\nYou don't get any byproduct but it will at least double if not quadruple the amount you would have get.\n\nWe put the &bForge Hammer&r here just so you know you can also use this machine if you need real fast crushing at one point. This one will &4never&r give you byproduct though. Could be useful until you reach &6HV&r.", + "quests.ore_proc.crushed_ores.title": "So crushed ores is just the beginning", + "quests.ore_proc.crushed_ores.subtitle": "Where are my dusts", + "quests.ore_proc.crushed_ores.desc": "Now that you have your crushed ores we can say that you officially started the beginning of &6Ore Processing&r. Later on you will be able to use a &bLarge Miner&r to get your &dcrushed&r ores right away.\n\nFrom crushed ores we advise you to &dpurify&r your ores. To do that you have three options that we will explain in the next quests and give you some example of what we would recommend.\n\nAs always you may have different needs than our propositions so explore &bEMI&r and trust yourself.", + "quests.ore_proc.sodium_persuflate.title": "Bath them in Sodium Persuflate", + "quests.ore_proc.sodium_persuflate.subtitle": "It's some kind of salt", + "quests.ore_proc.sodium_persuflate.desc": "You can wash your crushed ores in a &bChemical Bath&r with &dSodium Persuflate&r to get some extra byproduct. Not all the ores can be processed that way but for the ones that can your crushed ores will have a higher wield than in the usual washing, around &670%&r chance of byproduct with the &bChemical Bath&r against the &630%&r of the &bOre Washer&r.\n\nThough obtaining &dSodium Persuflate&r isn't that easy to mass produce though we would advise you to look at &9Sea Water&r, it's your choice if you want to use this method for all the ores that can use this process.\n\nWe give you some examples of ores we believe are &6worthy&r to bath with &dSodium Persuflate&r because their byproduct are pretty rare or useful. Simply look at the quest on the left.", + "quests.ore_proc.sodium_ores.title": "Some ores you could bath in Sodium Persuflate", + "quests.ore_proc.sodium_ores.subtitle": "They are just examples", + "quests.ore_proc.sodium_ores.desc": "We thought these ones are note worthy\n\n-&6Crushed Aluminium&r for &dRutile&r your first way to get &dTitanium&r\n\n-&6Crushed Bauxite&r for &dGallium&r\n\n-&6Crushed Cobalt&r for &dCobaltite&r which is a good way to make &dArsenic&r\n\n-&6Crushed Tetrahedrite&r to make &dCadmium&r which doesn't have many uses right now but who knows that could change one day", + "quests.ore_proc.ore_washer.title": "Washing your ores with water", + "quests.ore_proc.ore_washer.subtitle": "That's the standart way to do", + "quests.ore_proc.ore_washer.desc": "Using an &dOre Washer&r or &9Bulk Washing&r with an &dEncased fan&r will be the general method you use to get your &6Crushed Ores&r to the next step.\n\nThere is some stuffs to know if you use the &bGregtech&r machine though, first if you use &9Distilled Water&r the recipe will be &a50%&r faster and also know that if you don't care about the byproduct you can use circuit #2 so the recipes is &425 times faster but with no byproduct&r.", + "quests.ore_proc.mercury_ores.title": "Bath them in Mercury", + "quests.ore_proc.mercury_ores.subtitle": "This one is quite bad for your health", + "quests.ore_proc.mercury_ores.desc": "You can wash your crushed ores in a &bChemical Bath&r with &dMercury&r to get some extra byproduct. Not all the ores can be processed that way but for the ones that can your crushed ores will have a higher wield than in the usual washing, around &670%&r chance of byproduct with the &bChemical Bath&r against the &630%&r of the &bOre Washer&r.\n\nIn that case obtaining &dMercury&r is quite easy you can just get it from &cRedstone&r or &cCinnabar&r, it's your choice if you want to use this method for all the ores that can use this process.\n\nWe give you some examples of ores we believe are &6worthy&r to bath with &dMercury&r because their byproduct are pretty rare or useful. Simply look at the quest on the right.", + "quests.ore_proc.mercury.title": "Some ores you could bath in Mercury", + "quests.ore_proc.mercury.subtitle": "They are just examples", + "quests.ore_proc.mercury.desc": "We thought these ones are note worthy\n\n-&6Crushed Platinium&r for &dPaladium&r\n\n-&6Crushed Sheldonite&r for &dPaladium&r\n\n-&6Crushed Nickel&r for &dPlatinium&r\n\nThey are easy way to get access to these metals before doing the rough Platline.", + "quests.ore_proc.purified_ores.title": "It's been Purified", + "quests.ore_proc.purified_ores.subtitle": "You can do quite a lot with the purified ones", + "quests.ore_proc.purified_ores.desc": "You reached the &6Purified Ores&r, once again you have different options to go further.\n\nYou'll also notice quests on both sides that mark the beginning of the infamous &dPlatline&r and the easier &dIndium Line&r, each starting with specific &6Purified Ores&r. Take a look at it as it might come in handy soon. It could be a good idea to store these for when you tackle those specific quest lines.", + "quests.ore_proc.indium.title": "The Indium Line", + "quests.ore_proc.indium.subtitle": "We say line but really it's a two step process", + "quests.ore_proc.indium.desc": "The &6Indium Line&r shouldn't be needed before &9IV&r but we are just letting you know that it's here and that you will need purified &bSphalerite&r and &bGalena&r.", + "quests.ore_proc.platline.title": "The infamous platline", + "quests.ore_proc.platline.subtitle": "This one is a bit tricker and yet it's an easy version", + "quests.ore_proc.platline.desc": "The &6Platinium Line&r will be your first challenging line, providing you with essential metals: &bPlatinium&r, &bPalladium&r, &bRuthenium&r, &bRhodium&r, &bIridium&r, and &bOsmium&r.\n\nWhile you've already seen alternative ways to obtain &bPlatinium&r and &bPalladium&r earlier in this chapter, this line will be &amandatory&r for accessing the others.\n\nThe Platline can be started at &6HV&r, but you won’t be able to complete it fully until you reach &dEV&r.", + "quests.ore_proc.macerator_separator.title": "The crushing is back only for a precise situation", + "quests.ore_proc.macerator_separator.subtitle": "This path really needs some love", + "quests.ore_proc.macerator_separator.desc": "This is the path of the &6Electromagnetic Separator&r, a rather unique machine used to extract byproducts from specific dusts.\n\nFirst, macerate the &dRefined Ores&r, then process them with the &6Electromagnetic Separator&r.\n\nKeep in mind that to obtain byproducts, your macerator or crushing wheels must be at least &6HV&r tier.", + "quests.ore_proc.electro_separator.title": "It's time for Electromagnetic Separation", + "quests.ore_proc.electro_separator.subtitle": "Except Naquadah it doesn't do much", + "quests.ore_proc.electro_separator.desc": "Now, you just need to send the &6Purified Pile of Dust&r into the &bElectromagnetic Separator&r.\n\nFor now, we recommend using it primarily for &dNaquadah&r. If you need more &aNeodymium&r, you can also process &dBastnasite&r.\n\nIt’s not much for the moment, but we might expand on this in the future.", + "quests.ore_proc.thermal_centrifuge.title": "The Thermal Centrifuge", + "quests.ore_proc.thermal_centrifuge.subtitle": "Usually you will use this one", + "{quests.ore_proc.thermal_centrifuge.desc}": "If you don't have any other use for your &6Purified Ores&r, consider processing them in the &dThermal Centrifuge&r. It still provides valuable byproducts, and at this stage, it would be a shame not to make use of it.", + "quests.ore_proc.sifter.title": "More shiny stuffs", + "quests.ore_proc.sifter.subtitle": "It goes tch tch tch and then it shines", + "quests.ore_proc.sifter.desc": "The &6Sifter&r should be used for all your &aGems&r. It's not essential early on, as it's fairly slow, but once you feel ready, it's worth doing—you’ll get a better yield in return.", + "quests.ore_proc.centrifuge_sifter.title": "Centrifuging the dust", + "quests.ore_proc.centrifuge_sifter.subtitle": "Yeah there is ore processing on the byproducts", + "quests.ore_proc.centrifuge_sifter.desc": "This time, centrifuging will only be used for the &6Purified Dust&r you obtain from the &6Sifter&r. Not much to explain—just go ahead and do it.", + "quests.ore_proc.dust_processed.title": "Your final dust", + "quests.ore_proc.dust_processed.subtitle": "Or is it?", + "quests.ore_proc.dust_processed.desc": "Well, that’s it—great job! You’ve mostly completed it.\n\nNow that you have the &6Purified Dust&r, you can &ccook&r it, &estore&r it, or even &dmix&r it right away—why not? Some dusts will still require special treatment before they become truly useful.\n\nBeyond that, keep in mind that your &6ore processing line&r should always be upgraded and fine-tuned to match your needs. You'll unlock new machines that work faster and generate more valuable byproducts.", + "quests.ore_proc.electrolyzer.title": "After electrolyzing it's the real last step", + "quests.ore_proc.electrolyzer.subtitle": "Some are not worth the effort though", + "quests.ore_proc.electrolyzer.desc": "Well… we lied—there’s still one more step for some dusts.\n\nCertain &6Purified Dusts&r have no direct use. For example, &2Tantalite&r must be processed in an &6Electrolyzer&r to extract valuable materials like &dTantalum&r and &dManganese&r.\n\nMost of these recipes will unlock once you have access to an &bMV Electrolyzer&r, so keep an eye on your tech progression!", + "quests.ore_proc.packer.title": "This one is used as an autocrafting table in some way", + "quests.ore_proc.packer.subtitle": "It's real fast", + "quests.ore_proc.packer.desc": "Back in the old days, this little bad boy saw a lot of use—you used to get a ton of &6Small&r and &6Tiny Dusts&r from ore processing.\n\nNowadays, it’s mostly useful for processing &dRare Earth&r in the &6Centrifuge&r and packing all those valuable &6Small Piles of Dust&r.\n\nAlso, don’t forget: it becomes surprisingly powerful when paired with a &eRobot Arm&r set to supply exact mode.", "quests.steam_age": "Early Automation", "quests.steam_age.subtitle": "From Primitive Machines to Steam Power", "quests.steam_age.basic_greate.title": "Basics of Greate", diff --git a/kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json b/kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json index 991d9e753..886d98ca0 100644 --- a/kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json +++ b/kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json @@ -12,13 +12,13 @@ { "function": "minecraft:set_count", "count": { - "min": 3, - "max": 9, + "min": 6, + "max": 12, "type": "minecraft:uniform" } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -33,7 +33,7 @@ } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -48,7 +48,7 @@ } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -57,43 +57,63 @@ { "function": "minecraft:set_count", "count": { - "min": 5, + "min": 6, "max": 12, "type": "minecraft:uniform" } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", "name": "gtceu:tin_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", "name": "minecraft:copper_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 2 + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:silver_ingot", + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:bronze_ingot", + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:bismuth_bronze_ingot", + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "minecraft:iron_ingot", + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "create:zinc_ingot", + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "create:brass_ingot", + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:bismuth_ingot", + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:nickel_ingot", + "weight": 100 }, { "type": "minecraft:item", @@ -108,7 +128,7 @@ } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -123,7 +143,7 @@ } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -138,7 +158,7 @@ } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -153,7 +173,7 @@ } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -162,28 +182,13 @@ { "function": "minecraft:set_count", "count": { - "min": 4, + "min": 6, "max": 12, "type": "minecraft:uniform" } } ], - "weight": 2 - }, - { - "type": "minecraft:item", - "name": "gtceu:raw_graphite", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 2, - "type": "minecraft:uniform" - } - } - ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -198,22 +203,7 @@ } } ], - "weight": 2 - }, - { - "type": "minecraft:item", - "name": "tfc:kaolin_clay", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 2, - "max": 4, - "type": "minecraft:uniform" - } - } - ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -222,13 +212,13 @@ { "function": "minecraft:set_count", "count": { - "min": 4, - "max": 8, + "min": 12, + "max": 18, "type": "minecraft:uniform" } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -237,13 +227,13 @@ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 4, + "min": 6, + "max": 8, "type": "minecraft:uniform" } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -252,28 +242,13 @@ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 4, + "min": 4, + "max": 6, "type": "minecraft:uniform" } } ], - "weight": 2 - }, - { - "type": "minecraft:item", - "name": "minecraft:glow_berries", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 8, - "max": 16, - "type": "minecraft:uniform" - } - } - ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", @@ -282,28 +257,28 @@ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 4, + "min": 4, + "max": 6, "type": "minecraft:uniform" } } ], - "weight": 2 + "weight": 100 }, { "type": "minecraft:item", - "name": "minecraft:glowstone_dust", + "name": "minecraft:gunpowder", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 4, + "min": 4, + "max": 6, "type": "minecraft:uniform" } } ], - "weight": 2 + "weight": 100 } ] } diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index bf6a2626d..8946b655f 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -8,7 +8,7 @@ const registerCreateItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', item) }) - // Is this Greate's fault? + // This is greate's fault event.remove('c:hidden_from_recipe_viewers', 'create:copper_sheet') event.remove('c:hidden_from_recipe_viewers', 'create:brass_sheet') event.remove('c:hidden_from_recipe_viewers', 'create:golden_sheet') @@ -18,6 +18,7 @@ const registerCreateItemTags = (event) => { event.remove('c:hidden_from_recipe_viewers', 'create:crushed_raw_tin') event.remove('c:hidden_from_recipe_viewers', 'create:crushed_raw_silver') event.remove('c:hidden_from_recipe_viewers', 'create:crushed_raw_lead') + event.remove('c:hidden_from_recipe_viewers', 'create:powdered_obsidian') // Тэги для ручек и сидушек global.MINECRAFT_DYE_NAMES.forEach(dye => { diff --git a/kubejs/server_scripts/exposure/recipes.js b/kubejs/server_scripts/exposure/recipes.js index fbde705f9..8df906463 100644 --- a/kubejs/server_scripts/exposure/recipes.js +++ b/kubejs/server_scripts/exposure/recipes.js @@ -111,4 +111,6 @@ const registerExposureRecipes = (event) => { item: "exposure:developed_color_film" } }).id('exposure:developing_color_film') + + event.replaceInput({id: 'exposure:interplanar_projector'}, 'minecraft:ender_eye', '#forge:plates/silver') } \ No newline at end of file