From adb30e1ad113669b1d5125beaaa2be70eaa33d42 Mon Sep 17 00:00:00 2001 From: m2r1k5 <61507029+m2r1k5@users.noreply.github.com> Date: Sun, 13 Feb 2022 19:10:18 +0800 Subject: [PATCH] 0.6 --- .../config/betterquesting/DefaultQuests.json | 887 +++++++++++------- overrides/config/betterquesting/questbook.cfg | 2 +- overrides/resources/gregtech/lang/en_us.lang | 1 + overrides/scripts/BlastFurnace.zs | 1 + overrides/scripts/Earlygame.zs | 81 +- overrides/scripts/Endgame.zs | 95 +- overrides/scripts/Midgame.zs | 48 +- overrides/scripts/_oreDict.zs | 2 +- overrides/scripts/aa xu2.zs | 42 +- overrides/scripts/electronics.zs | 96 +- overrides/scripts/extendedcrafting.zs | 8 +- overrides/scripts/materials.zs | 3 +- 12 files changed, 830 insertions(+), 436 deletions(-) create mode 100644 overrides/resources/gregtech/lang/en_us.lang diff --git a/overrides/config/betterquesting/DefaultQuests.json b/overrides/config/betterquesting/DefaultQuests.json index 2c7ae0b..e1f7ac5 100644 --- a/overrides/config/betterquesting/DefaultQuests.json +++ b/overrides/config/betterquesting/DefaultQuests.json @@ -811,7 +811,8 @@ }, "11:10": { "preRequisites:11": [ - 66 + 66, + 909 ], "properties:10": { "betterquesting:10": { @@ -1554,7 +1555,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§6Steel§r is a basic component in all sorts of machines and alloys. It is made in the §3Alloy Smelter§r.\n\nYou might want to save your §6Coal Dust§r for circuits and use §6Charcoal Dust§r instead. Later, you can also centrifuge either of these dusts or §6Coal Coke Dust§r into §6Carbon Dust§r, which can be used for Steel and other useful things.", + "desc:8": "You already have §6Steel§r, but it can be made much faster in the §3Alloy Smelter§r, at the cost of EU.\n\nYou might want to save your §6Coal Dust§r for circuits and use §6Charcoal Dust§r instead. Later, you can also process either of these dusts, §6Coal Coke Dust§r, §2or Diamond Dust§r into §6Carbon Dust§r, which can be used for Steel and other useful things.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -1565,7 +1566,7 @@ "ismain:1": 1, "issilent:1": 0, "lockedprogress:1": 1, - "name:8": "Steel", + "name:8": "§2Steel", "partysinglereward:1": 0, "questlogic:8": "AND", "repeat_relative:1": 1, @@ -2719,7 +2720,8 @@ "preRequisites:11": [ 530, 40, - 24 + 24, + 909 ], "properties:10": { "betterquesting:10": { @@ -9351,13 +9353,13 @@ "138:10": { "preRequisites:11": [ 285, - 527, - 881 + 881, + 910 ], "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "With §6Lumium, Vanadium-Gallium§r, §2and Polyphenylene Sulfide§r, you can now make hulls for Ludicrous Voltage (LuV) §bGregTech§r machines.", + "desc:8": "With §6§2Rhodium Plated Lumium-Palladium§r,§6 Vanadium-Gallium§r, §2and Polyphenylene Sulfide§r, you can now make hulls for Ludicrous Voltage (LuV) §bGregTech§r machines.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -12324,7 +12326,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "Petrochemistry is the category of organic chemistry pertaining to petroleum, otherwise known as §9Oil§r.\n\n§bGregTech§r\u0027s petrochemistry may seem daunting at first, given the sheer number of chemicals and processing options, but it\u0027s actually easier to get into than you think.\n\nOil is the starting point, and can be found in several variants which you can pump from finite natural wells on the Overworld, as well as coming renewably from §6Oilsands Ore§r and directly in liquid form from an §3Oil Drilling Rig§r. The variant simply called \"Oil\" is the standard ratio of distillation products and is what you will always get from the latter two sources. §9Light Oil§r and §9Heavy Oil§r are effectively the same as Oil, but with different ratios of distillation products.\n\nThe upcoming quests will guide you through the basics of petrochemistry. Once you\u0027ve mastered that, feel free to explore further.\n", + "desc:8": "Petrochemistry is the category of organic chemistry pertaining to petroleum, otherwise known as §9Oil§r.\n\n§bGregTech§r\u0027s petrochemistry may seem daunting at first, given the sheer number of chemicals and processing options, but it\u0027s actually easier to get into than you think.\n\nOil is the starting point, and can be found in several variants which you can pump from finite natural wells on the Overworld, as well as coming renewably from §6Oilsands Ore§r and §6Soul Sand§r, and directly in liquid form from a §3Fluid Rig§r. The variant simply called \"Oil\" is the standard ratio of distillation products and is what you will always get from the latter two sources. §9Light Oil§r and §9Heavy Oil§r are effectively the same as Oil, but with different ratios of distillation products.\n\nThe upcoming quests will guide you through the basics of petrochemistry. Once you\u0027ve mastered that, feel free to explore further.\n", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -14547,7 +14549,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "This is your first Micro Miner ever.\nYes, not the last: these things aren\u0027t reusable.\n\nThis one can get you:\n§6* Cassiterite Ore\n* Dense Iron Ore\n* Uraninite Ore\n* Redstone Ore\n* Nickel Ore\n* Rutile Ore\n* Galena Ore\n* Moon Turf\n* Dilithium\n* Salt Ore§r\n\nWhen equipped with a Gemstone Sensor (which may currently not be available to you yet):\n§2* Perfect Diamond\n§6* Apatite Ore\n* Tricalcium Phosphate Ore\n* Quartzite Ore§r\n\nCan also be used to bring §bStellar Creation Data§r, but less efficiently than the Tier Two.\n\n", + "desc:8": "This is your first Micro Miner ever.\nYes, not the last: these things aren\u0027t reusable.\n\nThis one can get you:\n§6* Cassiterite Ore\n* Dense Iron Ore\n* Uraninite Ore\n* Redstone Ore\n* Nickel Ore\n§2* Bauxite Ore\n§6* Galena Ore\n* Moon Turf\n* Dilithium\n* Salt Ore§r\n§2* Molybdenum Ore§r\n\nWhen equipped with a Gemstone Sensor (which may currently not be available to you yet):\n§2* Perfect Diamond\n§6* Apatite Ore\n* Tricalcium Phosphate Ore\n* Quartzite Ore§r\n\nCan also be used to bring §bStellar Creation Data§r, but less efficiently than the Tier Two.\n\n", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -18908,7 +18910,6 @@ "283:10": { "preRequisites:11": [ 138, - 199, 531, 853, 286 @@ -18916,7 +18917,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "With your §6Lumium§r-based machine hulls, Assembling Machine built, and §6Quantum Processor Mainframes§r squared away, you can finally get on the path to making a Ludicrous Voltage §3Assembling Machine§r.\n\nThis tier of Assembling Machine unlocks §6Crystal Circuits§r, as well as handling crafting recipes up to 32768 EU/t. It can also optionally overclock recipes that consume up to 8192 EU/t for improved speed at the cost of relatively more power.", + "desc:8": "With your §6§2Rhodium Plated Lumium-Palladium§r-based machine hulls, Assembling Machine built, and §6Quantum Processor Mainframes§r squared away, you can finally get on the path to making a Ludicrous Voltage §3Assembling Machine§r.\n\nThis tier of Assembling Machine unlocks §6Crystal Circuits§r, as well as handling crafting recipes up to 32768 EU/t. It can also optionally overclock recipes that consume up to 8192 EU/t for improved speed at the cost of relatively more power.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -19192,7 +19193,6 @@ }, "287:10": { "preRequisites:11": [ - 681, 847 ], "properties:10": { @@ -21590,8 +21590,7 @@ }, "324:10": { "preRequisites:11": [ - 323, - 138 + 323 ], "properties:10": { "betterquesting:10": { @@ -22085,9 +22084,8 @@ }, "332:10": { "preRequisites:11": [ - 533, 842, - 906 + 907 ], "properties:10": { "betterquesting:10": { @@ -22283,8 +22281,8 @@ }, "335:10": { "preRequisites:11": [ - 196, - 334 + 334, + 908 ], "properties:10": { "betterquesting:10": { @@ -32006,8 +32004,7 @@ }, "523:10": { "preRequisites:11": [ - 525, - 527 + 525 ], "properties:10": { "betterquesting:10": { @@ -32274,7 +32271,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "Glowing! §2But all the GTCEu machines glow already, so...§r\n\nThis one takes a significant amount of time to cook, so make sure to have it going constantly.\n\nWires made from §6Lumium§r transmit IV power losslessly, and it forms the basis for §6LuV Machine Hulls§r.", + "desc:8": "Glowing! §2But all the GTCEu machines glow already, so...§r\n\nThis one takes a significant amount of time to cook, so make sure to have it going constantly.\n\nWires made from §6Lumium§r transmit IV power losslessly, and it forms part of the basis for §6LuV Machine Hulls§r.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -32520,7 +32517,7 @@ "requiredItems:9": { "0:10": { "Count:3": 1, - "Damage:2": 335, + "Damage:2": 324, "OreDict:8": "", "id:8": "gregtech:meta_plate" }, @@ -41830,7 +41827,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "The §aImplosion Compressor§f is like an autoclave that uses explosions instead of water. It is the only way to turn most gem dusts into gemstones.\n\nIt will also be vital for processing §5Motes of Omnium§f.\n\nIn addition to the controller and casings, you will need one §eLV or better§r §6Item Input Bus§r, §6Item Output Bus§r, and §6Energy Input Hatch§r.", + "desc:8": "The §aImplosion Compressor§f is like an autoclave that uses explosions instead of water. It is the only way to turn most gem dusts into gemstones.\n\nIt will also be vital for processing §5Motes of Omnium§f.\n\nIn addition to the controller and casings, you will need one §eLV or better§r §6Item Input Bus§r, §6Item Output Bus§r, and §6Energy Input Hatch§r.\n\n§2If desired, you may upgrade this directly to an Electric Implosion Compressor, which can accept Parallel Control hatches.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -41841,7 +41838,7 @@ "ismain:1": 1, "issilent:1": 0, "lockedprogress:1": 1, - "name:8": "Implosion Compressor", + "name:8": "§2Implosion Compressor", "partysinglereward:1": 0, "questlogic:8": "AND", "repeat_relative:1": 1, @@ -41882,12 +41879,6 @@ "Damage:2": 1003, "OreDict:8": "", "id:8": "gregtech:machine" - }, - "1:10": { - "Count:3": 22, - "Damage:2": 4, - "OreDict:8": "", - "id:8": "gregtech:metal_casing" } }, "taskID:8": "bq_standard:retrieval" @@ -46975,7 +46966,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "Now that you have acquired §6Steel§6§r, your path to infinite cobblestone awaits! The §6Cobblestone Generator§r continuously outputs cobblestone into adjacent inventories, and can be upgraded to produce it even faster.\n\nCobblestone can be processed into many useful materials:\n\n§6Gravel§r is useful for making conduits and §9Concrete§r.\n\n§6Sand§r is useful for §6Glass§r, which can be turned into §6Nether Quartz§r.\n\nFinally, §6Dust§r can be turned into §6Clay§r which is both a reliable source of §6Aluminium§r and very important for automating §bDeep Mob Learning§r.\n\nSet up a §ecobbleworks§r soon, so you can stockpile all these useful materials.\n", + "desc:8": "Now that you have acquired §6Steel§6§r, your path to infinite cobblestone awaits! The §6Cobblestone Generator§r continuously outputs cobblestone into adjacent inventories, and can be upgraded to produce it even faster.\n\nCobblestone can be processed into many useful materials:\n\n§6Stone Dust§r is useful for small amounts of a whole host of useful materials.\n\n§6Gravel§r is useful for making conduits and §9Concrete§r.\n\n§6Sand§r is useful for §6Glass§r, which can be turned into §6Nether Quartz§r or §6Silicon Dioxide§r for §6Oxygen§r.\n\nFinally, §6Dust§r can be turned into §6Clay§r which is both a reliable source of §6Aluminium§r and very important for automating §bDeep Mob Learning§r.\n\nSet up a §ecobbleworks§r soon, so you can stockpile all these useful materials.\n", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -46986,7 +46977,7 @@ "ismain:1": 0, "issilent:1": 0, "lockedprogress:1": 1, - "name:8": "Infinite Cobblestone", + "name:8": "§2Infinite Cobblestone", "questlogic:8": "AND", "repeat_relative:1": 1, "repeattime:3": -1, @@ -47997,7 +47988,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "The §6Naquadah-Doped Boule§r is the final boule type and produces the most wafers per boule. It also is relatively cheap, due to the abundance of Naqudah that is gained from the §eTier 5 Micro Miner Mission§r.\n\nThis boule also allows the production of §6Advanced System on Chip§r wafers, which are used to make the final forms of the circuits very cheaply. However, you might not be able to take advantage of the §6Advanced System on Chip§r yet, due to the power requirements.", + "desc:8": "The §6Naquadah-Doped Boule§r produces even more wafers per boule. It also is relatively cheap, due to the abundance of Naquadah that is gained from the §eTier 5 Micro Miner Mission§r.\n\nThis boule also allows the production of §6Advanced System on Chip§r wafers, which are used to make the final forms of the circuits very cheaply. However, you might not be able to take advantage of the §6Advanced System on Chip§r yet, due to the power requirements.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -49091,7 +49082,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Technically not new to CEu, but it was disabled in the original version, and it had much less functionality in CE.§r\n\nThe Arc Furnace allows you to make Annealed Copper, which will be used in the MV Age. It can also make 2 pieces of Glass from 1 Sand. It also recycles your old Machines, similar to a Macerator.\n\nAll of its recipes require Oxygen.", + "desc:8": "§2Technically not new to CEu, but it was disabled in the original version, and it had much less functionality in CE.§r\n\nThe Arc Furnace allows you to make §6Annealed Copper§r, which will be used in the MV Age. It can also make 2 pieces of Glass from 1 Sand. Later, it can make §2Tempered Glass§r§r for use in higher-tier recipes.\n\nThe Arc Furnace also functions as a §auniversal recycling machine§r. Pretty much anything can be recycled into ingots and dusts of its base components.\n\nAll of its recipes require Oxygen.\n\nAll Arc Furnace recipes use exactly 30 EU/t, so you can get away with using LV Arc Furnaces for the whole pack!", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -49953,7 +49944,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2A rudimentary version of Platinum Group Sludge (PGS) processing existed in the base pack. Here, it is a strong source of Ruthenium and Rhodium, both used in higher tiers. And of course it is a source of Palladium, Osmium, Iridium, Platinum, and Gold.\n\nYou will need to treat certain ores with Nitric Acid to yield PGS - Sheldonite is the best. Then, using an HV+ Centrifuge and Aqua Regia, break it down into the PGS salts, and reduce those salts to the metals.\n\nThis is still optional, and you can get Ruthenium and Rhodium from Osmiridium 80/20 Ore and Iridosmine 80/20 Ore from Microverse adventures.", + "desc:8": "§2A rudimentary version of Platinum Group Sludge (PGS) processing existed in the base pack. Here, it is a strong source of Ruthenium and Rhodium, both used in higher tiers. And of course it is a source of Palladium, Osmium, Iridium, Platinum, and Gold.\n\nYou will need to treat certain ores with Nitric Acid to yield PGS - Sheldonite is the best. Then, using an HV+ Centrifuge and Aqua Regia, break it down into the PGS salts, and reduce those salts to the metals.\n\nThis is still optional, and you can get Ruthenium and Rhodium from Osmiridium 80/20 Ore and Iridosmine 80/20 Ore from Microverse adventures instead.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -51012,8 +51003,7 @@ }, "843:10": { "preRequisites:11": [ - 323, - 138 + 323 ], "properties:10": { "betterquesting:10": { @@ -51196,8 +51186,7 @@ }, "846:10": { "preRequisites:11": [ - 844, - 536 + 844 ], "properties:10": { "betterquesting:10": { @@ -51267,7 +51256,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2A strong heavy element obtained only from the Naquadah chain.\n\nTrinium comes out at the second step of Naquadah Dust processing, so if you don\u0027t mind storing the intermediates and have Fluorine under control, you can hold off doing the full chain if you don\u0027t need to yet. You get 1 Trinium per 12 Naquadah processed.\n\nThis will be required in large quantities for Trinium Coils, Superconducting Coil Blocks, Naquadah Alloy, among other things.", + "desc:8": "§2A strong heavy element obtained only from the Naquadah chain.\n\nTrinium comes out at the second step of Naquadah Dust processing, so if you don\u0027t mind storing the intermediates and have Fluorine under control, you can hold off doing the full chain if you don\u0027t need to yet. You get 1 Trinium per 12 Naquadah processed.\n\nThis will be required in large quantities for Trinium Coils, Superconducting Coil Blocks, Naquadah Alloy, among other things. You will need over 10 stacks for a Fusion Reactor Mk1, so stock up on it.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -51807,7 +51796,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "Enhanced Boules using Neutronium.", + "desc:8": "The final Boule. It grants the most wafers, and is required for Highly Advanced Systems-on-Chip.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -55070,6 +55059,214 @@ "taskID:8": "bq_standard:retrieval" } } + }, + "907:10": { + "preRequisites:11": [ + 906, + 533 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "No Description", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "minecraft:nether_star" + }, + "ismain:1": 0, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "ZPM or Large Circuit Assembler", + "questlogic:8": "OR", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "NORMAL" + } + }, + "questID:3": 907, + "rewards:9": {}, + "tasks:9": {} + }, + "908:10": { + "preRequisites:11": [ + 196 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "No Description", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "minecraft:nether_star" + }, + "ismain:1": 0, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "Tritanium Ingot", + "questlogic:8": "AND", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "NORMAL" + } + }, + "questID:3": 908, + "rewards:9": {}, + "tasks:9": {} + }, + "909:10": { + "preRequisites:11": [ + 805 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "A mixture of Clay and Brick produces large quantities of §6Firebricks§r, used in building the §3Primitive Blast Furnace§r. This allows you to make §6Steel§r from §6Wrought Iron§r, which forms the basis of LV Machine Hulls.\n\nThe §3PBF§r has been changed to be blazing fast - just 20 seconds per §6Steel Ingot§r! You will still want to keep it running, as you won\u0027t stop needing Steel.", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 1000, + "OreDict:8": "", + "id:8": "gregtech:machine" + }, + "ismain:1": 0, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "§2§2Primitive Steelworks", + "questlogic:8": "AND", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "NORMAL" + } + }, + "questID:3": 909, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 3, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "contenttweaker:omnicoin5" + } + } + } + }, + "tasks:9": { + "0:10": { + "autoConsume:1": 0, + "consume:1": 0, + "groupDetect:1": 0, + "ignoreNBT:1": 0, + "index:3": 0, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 1000, + "OreDict:8": "", + "id:8": "gregtech:machine" + }, + "1:10": { + "Count:3": 32, + "Damage:2": 1, + "OreDict:8": "", + "id:8": "gregtech:metal_casing" + }, + "2:10": { + "Count:3": 1, + "Damage:2": 324, + "OreDict:8": "", + "id:8": "gregtech:meta_ingot" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } + }, + "910:10": { + "preRequisites:11": [ + 527, + 827 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "§2Rhodium Plated Lumium-Palladium is a mixture of Rhodium, Lumium and Palladium. It forms the basis of LuV Machine Hulls.", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 2062, + "OreDict:8": "", + "id:8": "gregtech:meta_ingot" + }, + "ismain:1": 1, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "§2Rhodium Plated Lumium-Palladium", + "questlogic:8": "AND", + "repeat_relative:1": 1, + "repeattime:3": -1, + "simultaneous:1": 0, + "snd_complete:8": "minecraft:entity.player.levelup", + "snd_update:8": "minecraft:entity.player.levelup", + "tasklogic:8": "AND", + "visibility:8": "NORMAL" + } + }, + "questID:3": 910, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "contenttweaker:omnicoin5" + } + } + } + }, + "tasks:9": { + "0:10": { + "autoConsume:1": 0, + "consume:1": 0, + "groupDetect:1": 0, + "ignoreNBT:1": 0, + "index:3": 0, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 2062, + "OreDict:8": "", + "id:8": "gregtech:meta_ingot" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } }, "questLines:9": { @@ -56353,979 +56550,965 @@ "y:3": -48 }, "6:10": { - "id:3": 138, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": -252, - "y:3": 276 - }, - "7:10": { "id:3": 139, "sizeX:3": 24, "sizeY:3": 24, "x:3": -228, "y:3": 132 }, - "8:10": { + "7:10": { "id:3": 144, "sizeX:3": 24, "sizeY:3": 24, "x:3": -228, "y:3": 168 }, - "9:10": { + "8:10": { "id:3": 148, "sizeX:3": 36, "sizeY:3": 36, "x:3": -762, "y:3": 102 }, - "10:10": { + "9:10": { "id:3": 149, "sizeX:3": 24, "sizeY:3": 24, "x:3": -756, "y:3": 72 }, - "11:10": { + "10:10": { "id:3": 150, "sizeX:3": 48, "sizeY:3": 48, "x:3": -576, "y:3": -12 }, - "12:10": { + "11:10": { "id:3": 151, "sizeX:3": 24, "sizeY:3": 24, "x:3": -756, "y:3": -48 }, - "13:10": { + "12:10": { "id:3": 152, "sizeX:3": 24, "sizeY:3": 24, "x:3": -756, "y:3": 0 }, - "14:10": { + "13:10": { "id:3": 153, "sizeX:3": 24, "sizeY:3": 24, "x:3": -684, "y:3": -48 }, - "15:10": { + "14:10": { "id:3": 156, "sizeX:3": 24, "sizeY:3": 24, "x:3": -564, "y:3": 40 }, - "16:10": { + "15:10": { "id:3": 157, "sizeX:3": 24, "sizeY:3": 24, "x:3": -564, "y:3": 72 }, - "17:10": { + "16:10": { "id:3": 158, "sizeX:3": 24, "sizeY:3": 24, "x:3": -512, "y:3": 72 }, - "18:10": { + "17:10": { "id:3": 159, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 72 }, - "19:10": { + "18:10": { "id:3": 160, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": -48 }, - "20:10": { + "19:10": { "id:3": 161, "sizeX:3": 24, "sizeY:3": 24, "x:3": -56, "y:3": -48 }, - "21:10": { + "20:10": { "id:3": 162, "sizeX:3": 24, "sizeY:3": 24, "x:3": -240, "y:3": 40 }, - "22:10": { + "21:10": { "id:3": 163, "sizeX:3": 24, "sizeY:3": 24, "x:3": -276, "y:3": 8 }, - "23:10": { + "22:10": { "id:3": 164, "sizeX:3": 24, "sizeY:3": 24, "x:3": -124, "y:3": -12 }, - "24:10": { + "23:10": { "id:3": 165, "sizeX:3": 24, "sizeY:3": 24, "x:3": -92, "y:3": -12 }, - "25:10": { + "24:10": { "id:3": 166, "sizeX:3": 24, "sizeY:3": 24, "x:3": -56, "y:3": -12 }, - "26:10": { + "25:10": { "id:3": 167, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": -12 }, - "27:10": { + "26:10": { "id:3": 168, "sizeX:3": 24, "sizeY:3": 24, "x:3": -124, "y:3": 24 }, - "28:10": { + "27:10": { "id:3": 170, "sizeX:3": 20, "sizeY:3": 20, "x:3": -302, "y:3": 74 }, - "29:10": { + "28:10": { "id:3": 171, "sizeX:3": 48, "sizeY:3": 48, "x:3": -420, "y:3": -12 }, - "30:10": { + "29:10": { "id:3": 172, "sizeX:3": 24, "sizeY:3": 24, "x:3": -276, "y:3": 72 }, - "31:10": { + "30:10": { "id:3": 173, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 0 }, - "32:10": { + "31:10": { "id:3": 174, "sizeX:3": 24, "sizeY:3": 24, "x:3": -408, "y:3": -48 }, - "33:10": { + "32:10": { "id:3": 175, "sizeX:3": 24, "sizeY:3": 24, "x:3": -408, "y:3": 40 }, - "34:10": { + "33:10": { "id:3": 176, "sizeX:3": 24, "sizeY:3": 24, "x:3": -306, "y:3": -48 }, - "35:10": { + "34:10": { "id:3": 177, "sizeX:3": 24, "sizeY:3": 24, "x:3": -258, "y:3": -48 }, - "36:10": { + "35:10": { "id:3": 178, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 24 }, - "37:10": { + "36:10": { "id:3": 179, "sizeX:3": 32, "sizeY:3": 32, "x:3": -160, "y:3": 68 }, - "38:10": { + "37:10": { "id:3": 180, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": -12 }, - "39:10": { + "38:10": { "id:3": 181, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": -48 }, - "40:10": { + "39:10": { "id:3": 182, "sizeX:3": 24, "sizeY:3": 24, "x:3": -276, "y:3": 108 }, - "41:10": { + "40:10": { "id:3": 184, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": -48 }, - "42:10": { + "41:10": { "id:3": 185, "sizeX:3": 48, "sizeY:3": 48, "x:3": -420, "y:3": 96 }, - "43:10": { + "42:10": { "id:3": 186, "sizeX:3": 24, "sizeY:3": 24, "x:3": -684, "y:3": 276 }, - "44:10": { + "43:10": { "id:3": 188, "sizeX:3": 24, "sizeY:3": 24, "x:3": -600, "y:3": 108 }, - "45:10": { + "44:10": { "id:3": 190, "sizeX:3": 24, "sizeY:3": 24, "x:3": -684, "y:3": 240 }, - "46:10": { + "45:10": { "id:3": 192, "sizeX:3": 24, "sizeY:3": 24, "x:3": -636, "y:3": 88 }, - "47:10": { + "46:10": { "id:3": 194, "sizeX:3": 24, "sizeY:3": 24, "x:3": -600, "y:3": 40 }, - "48:10": { + "47:10": { "id:3": 197, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 204 }, - "49:10": { + "48:10": { "id:3": 198, "sizeX:3": 24, "sizeY:3": 24, "x:3": -420, "y:3": 240 }, - "50:10": { + "49:10": { "id:3": 199, "sizeX:3": 24, "sizeY:3": 24, "x:3": -228, "y:3": 204 }, - "51:10": { + "50:10": { "id:3": 201, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 144 }, - "52:10": { + "51:10": { "id:3": 234, "sizeX:3": 24, "sizeY:3": 24, "x:3": -264, "y:3": 168 }, - "53:10": { + "52:10": { "id:3": 235, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": 108 }, - "54:10": { + "53:10": { "id:3": 245, "sizeX:3": 24, "sizeY:3": 24, "x:3": -792, "y:3": 156 }, - "55:10": { + "54:10": { "id:3": 246, "sizeX:3": 24, "sizeY:3": 24, "x:3": -548, "y:3": 180 }, - "56:10": { + "55:10": { "id:3": 248, "sizeX:3": 24, "sizeY:3": 24, "x:3": -774, "y:3": 246 }, - "57:10": { + "56:10": { "id:3": 249, "sizeX:3": 24, "sizeY:3": 24, "x:3": -792, "y:3": 276 }, - "58:10": { + "57:10": { "id:3": 250, "sizeX:3": 24, "sizeY:3": 24, "x:3": -810, "y:3": 246 }, - "59:10": { + "58:10": { "id:3": 255, "sizeX:3": 24, "sizeY:3": 24, "x:3": -548, "y:3": 144 }, - "60:10": { + "59:10": { "id:3": 261, "sizeX:3": 24, "sizeY:3": 24, "x:3": -288, "y:3": 276 }, - "61:10": { + "60:10": { "id:3": 267, "sizeX:3": 24, "sizeY:3": 24, "x:3": -744, "y:3": 204 }, - "62:10": { + "61:10": { "id:3": 275, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": 60 }, - "63:10": { - "id:3": 285, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": -252, - "y:3": 240 - }, - "64:10": { + "62:10": { "id:3": 297, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 108 }, - "65:10": { + "63:10": { "id:3": 298, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": 60 }, - "66:10": { + "64:10": { "id:3": 299, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 144 }, - "67:10": { + "65:10": { "id:3": 300, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 180 }, - "68:10": { + "66:10": { "id:3": 301, "sizeX:3": 24, "sizeY:3": 24, "x:3": -804, "y:3": 24 }, - "69:10": { + "67:10": { "id:3": 302, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": 24 }, - "70:10": { + "68:10": { "id:3": 303, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 24 }, - "71:10": { + "69:10": { "id:3": 304, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": 24 }, - "72:10": { + "70:10": { "id:3": 305, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": -12 }, - "73:10": { + "71:10": { "id:3": 306, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": -12 }, - "74:10": { + "72:10": { "id:3": 307, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": -12 }, - "75:10": { + "73:10": { "id:3": 308, "sizeX:3": 24, "sizeY:3": 24, "x:3": -804, "y:3": -12 }, - "76:10": { + "74:10": { "id:3": 309, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": -48 }, - "77:10": { + "75:10": { "id:3": 310, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 216 }, - "78:10": { + "76:10": { "id:3": 311, "sizeX:3": 24, "sizeY:3": 24, "x:3": -288, "y:3": 204 }, - "79:10": { + "77:10": { "id:3": 312, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -288, - "y:3": 316 + "x:3": -324, + "y:3": 240 }, - "80:10": { + "78:10": { "id:3": 318, "sizeX:3": 24, "sizeY:3": 24, "x:3": -330, "y:3": 108 }, - "81:10": { + "79:10": { "id:3": 328, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 132 }, - "82:10": { + "80:10": { "id:3": 339, "sizeX:3": 24, "sizeY:3": 24, "x:3": -720, "y:3": 156 }, - "83:10": { + "81:10": { "id:3": 340, "sizeX:3": 24, "sizeY:3": 24, "x:3": -756, "y:3": 156 }, - "84:10": { + "82:10": { "id:3": 341, "sizeX:3": 20, "sizeY:3": 20, "x:3": -418, "y:3": 279 }, - "85:10": { + "83:10": { "id:3": 344, "sizeX:3": 24, "sizeY:3": 24, "x:3": -508, "y:3": 180 }, - "86:10": { + "84:10": { "id:3": 347, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 204 }, - "87:10": { + "85:10": { "id:3": 350, "sizeX:3": 32, "sizeY:3": 32, "x:3": -160, "y:3": 236 }, - "88:10": { + "86:10": { "id:3": 390, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": 216 }, - "89:10": { + "87:10": { "id:3": 391, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 60 }, - "90:10": { + "88:10": { "id:3": 416, "sizeX:3": 24, "sizeY:3": 24, "x:3": -312, "y:3": 40 }, - "91:10": { + "89:10": { "id:3": 500, "sizeX:3": 24, "sizeY:3": 24, "x:3": -600, "y:3": 240 }, - "92:10": { + "90:10": { "id:3": 512, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 240 }, - "93:10": { + "91:10": { "id:3": 526, "sizeX:3": 48, "sizeY:3": 48, "x:3": -648, "y:3": 144 }, - "94:10": { + "92:10": { "id:3": 527, "sizeX:3": 24, "sizeY:3": 24, "x:3": -288, "y:3": 240 }, - "95:10": { + "93:10": { "id:3": 532, "sizeX:3": 48, "sizeY:3": 48, "x:3": -648, "y:3": -12 }, - "96:10": { + "94:10": { "id:3": 542, "sizeX:3": 24, "sizeY:3": 24, "x:3": -492, "y:3": 240 }, - "97:10": { + "95:10": { "id:3": 549, "sizeX:3": 48, "sizeY:3": 48, "x:3": -68, "y:3": 141 }, - "98:10": { + "96:10": { "id:3": 555, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": 252 }, - "99:10": { + "97:10": { "id:3": 580, "sizeX:3": 48, "sizeY:3": 48, "x:3": -68, "y:3": 201 }, - "100:10": { + "98:10": { "id:3": 610, "sizeX:3": 24, "sizeY:3": 24, "x:3": -192, "y:3": 168 }, - "101:10": { + "99:10": { "id:3": 611, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 168 }, - "102:10": { + "100:10": { "id:3": 669, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 276 }, - "103:10": { + "101:10": { "id:3": 671, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": 276 }, - "104:10": { + "102:10": { "id:3": 672, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 276 }, - "105:10": { + "103:10": { "id:3": 673, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": 312 }, - "106:10": { + "104:10": { "id:3": 674, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 312 }, - "107:10": { + "105:10": { "id:3": 675, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 312 }, - "108:10": { + "106:10": { "id:3": 676, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 348 }, - "109:10": { + "107:10": { "id:3": 677, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": 348 }, - "110:10": { + "108:10": { "id:3": 678, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 396 }, - "111:10": { + "109:10": { "id:3": 679, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 348 }, - "112:10": { + "110:10": { "id:3": 680, "sizeX:3": 48, "sizeY:3": 48, "x:3": -168, "y:3": 384 }, - "113:10": { + "111:10": { "id:3": 693, "sizeX:3": 24, "sizeY:3": 24, "x:3": -492, "y:3": 276 }, - "114:10": { + "112:10": { "id:3": 694, "sizeX:3": 24, "sizeY:3": 24, "x:3": -524, "y:3": 276 }, - "115:10": { + "113:10": { "id:3": 732, "sizeX:3": 24, "sizeY:3": 24, "x:3": -120, "y:3": 168 }, - "116:10": { + "114:10": { "id:3": 745, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -324, + "x:3": -252, "y:3": 240 }, - "117:10": { + "115:10": { "id:3": 746, "sizeX:3": 24, "sizeY:3": 24, "x:3": -852, "y:3": 216 }, - "118:10": { + "116:10": { "id:3": 748, "sizeX:3": 24, "sizeY:3": 24, "x:3": -852, "y:3": 252 }, - "119:10": { + "117:10": { "id:3": 751, "sizeX:3": 24, "sizeY:3": 24, "x:3": -852, "y:3": 180 }, - "120:10": { + "118:10": { "id:3": 756, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": -48 }, - "121:10": { + "119:10": { "id:3": 773, "sizeX:3": 0, "sizeY:3": 0, "x:3": -144, "y:3": 84 }, - "122:10": { + "120:10": { "id:3": 785, "sizeX:3": 24, "sizeY:3": 24, "x:3": -420, "y:3": 180 }, - "123:10": { + "121:10": { "id:3": 798, "sizeX:3": 24, "sizeY:3": 24, "x:3": -252, "y:3": 348 }, - "124:10": { + "122:10": { "id:3": 799, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -324, + "x:3": -252, "y:3": 276 }, - "125:10": { + "123:10": { "id:3": 800, "sizeX:3": 0, "sizeY:3": 0, "x:3": -264, "y:3": 84 }, - "126:10": { + "124:10": { "id:3": 806, "sizeX:3": 24, "sizeY:3": 24, "x:3": -56, "y:3": 108 }, - "127:10": { + "125:10": { "id:3": 807, "sizeX:3": 24, "sizeY:3": 24, "x:3": -276, "y:3": 40 }, - "128:10": { + "126:10": { "id:3": 825, "sizeX:3": 24, "sizeY:3": 24, "x:3": -684, "y:3": -100 }, - "129:10": { + "127:10": { "id:3": 826, "sizeX:3": 40, "sizeY:3": 40, "x:3": -64, "y:3": -108 }, - "130:10": { + "128:10": { "id:3": 827, "sizeX:3": 24, "sizeY:3": 24, "x:3": -258, "y:3": -79 }, - "131:10": { + "129:10": { "id:3": 828, "sizeX:3": 32, "sizeY:3": 32, "x:3": -384, "y:3": 272 }, - "132:10": { + "130:10": { "id:3": 835, "sizeX:3": 24, "sizeY:3": 24, "x:3": -92, "y:3": 24 }, - "133:10": { + "131:10": { "id:3": 838, "sizeX:3": 24, "sizeY:3": 24, "x:3": -600, "y:3": 156 }, - "134:10": { + "132:10": { "id:3": 841, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -320, - "y:3": 348 + "x:3": -324, + "y:3": 312 }, - "135:10": { + "133:10": { "id:3": 849, "sizeX:3": 24, "sizeY:3": 24, "x:3": -380, "y:3": 240 }, - "136:10": { + "134:10": { "id:3": 850, "sizeX:3": 32, "sizeY:3": 32, "x:3": -384, - "y:3": 344 + "y:3": 308 }, - "137:10": { + "135:10": { "id:3": 851, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -288, - "y:3": 348 + "x:3": -324, + "y:3": 276 }, - "138:10": { + "136:10": { "id:3": 852, "sizeX:3": 24, "sizeY:3": 24, "x:3": -56, "y:3": 348 }, - "139:10": { + "137:10": { "id:3": 857, "sizeX:3": 24, "sizeY:3": 24, "x:3": -720, "y:3": 312 }, - "140:10": { + "138:10": { "id:3": 858, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": -548, - "y:3": 312 + "sizeX:3": 32, + "sizeY:3": 32, + "x:3": -552, + "y:3": 308 }, - "141:10": { + "139:10": { "id:3": 859, "sizeX:3": 32, "sizeY:3": 32, "x:3": -424, "y:3": 308 }, - "142:10": { + "140:10": { "id:3": 888, "sizeX:3": 32, "sizeY:3": 32, "x:3": -60, "y:3": 68 }, - "143:10": { + "141:10": { "id:3": 892, "sizeX:3": 48, "sizeY:3": 48, "x:3": -68, "y:3": 264 }, - "144:10": { + "142:10": { "id:3": 899, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": -100 }, - "145:10": { + "143:10": { "id:3": 900, "sizeX:3": 24, "sizeY:3": 24, @@ -58099,7 +58282,7 @@ "id:3": 138, "sizeX:3": 32, "sizeY:3": 32, - "x:3": -220, + "x:3": -532, "y:3": 260 }, "5:10": { @@ -58191,7 +58374,7 @@ "sizeX:3": 48, "sizeY:3": 48, "x:3": -276, - "y:3": 192 + "y:3": 224 }, "18:10": { "id:3": 256, @@ -58285,627 +58468,662 @@ "y:3": 252 }, "31:10": { + "id:3": 285, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -576, + "y:3": 308 + }, + "32:10": { "id:3": 286, "sizeX:3": 48, "sizeY:3": 48, "x:3": -492, "y:3": 336 }, - "32:10": { + "33:10": { "id:3": 287, "sizeX:3": 48, "sizeY:3": 48, "x:3": -20, "y:3": 164 }, - "33:10": { + "34:10": { "id:3": 288, "sizeX:3": 48, "sizeY:3": 48, "x:3": -108, "y:3": 96 }, - "34:10": { + "35:10": { "id:3": 289, "sizeX:3": 24, "sizeY:3": 24, "x:3": -432, "y:3": 136 }, - "35:10": { + "36:10": { "id:3": 291, "sizeX:3": 24, "sizeY:3": 24, "x:3": -432, "y:3": 176 }, - "36:10": { + "37:10": { "id:3": 292, "sizeX:3": 24, "sizeY:3": 24, "x:3": -336, "y:3": 312 }, - "37:10": { + "38:10": { "id:3": 295, "sizeX:3": 24, "sizeY:3": 24, "x:3": 116, "y:3": 108 }, - "38:10": { + "39:10": { "id:3": 312, "sizeX:3": 24, "sizeY:3": 24, "x:3": -216, "y:3": -48 }, - "39:10": { + "40:10": { "id:3": 313, "sizeX:3": 24, "sizeY:3": 24, "x:3": -216, "y:3": 0 }, - "40:10": { + "41:10": { "id:3": 314, "sizeX:3": 24, "sizeY:3": 24, "x:3": -372, "y:3": 60 }, - "41:10": { + "42:10": { "id:3": 315, "sizeX:3": 24, "sizeY:3": 24, "x:3": -313, "y:3": -96 }, - "42:10": { + "43:10": { "id:3": 316, "sizeX:3": 24, "sizeY:3": 24, "x:3": -264, "y:3": 156 }, - "43:10": { + "44:10": { "id:3": 317, "sizeX:3": 24, "sizeY:3": 24, "x:3": -60, "y:3": 312 }, - "44:10": { + "45:10": { "id:3": 323, "sizeX:3": 24, "sizeY:3": 24, "x:3": -216, "y:3": 60 }, - "45:10": { + "46:10": { "id:3": 324, "sizeX:3": 36, "sizeY:3": 36, "x:3": -222, "y:3": 102 }, - "46:10": { + "47:10": { "id:3": 325, "sizeX:3": 24, "sizeY:3": 24, "x:3": 116, "y:3": 176 }, - "47:10": { + "48:10": { "id:3": 327, "sizeX:3": 24, "sizeY:3": 24, "x:3": -312, "y:3": 348 }, - "48:10": { + "49:10": { "id:3": 329, "sizeX:3": 24, "sizeY:3": 24, "x:3": 164, "y:3": 220 }, - "49:10": { + "50:10": { "id:3": 330, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": 220 }, - "50:10": { + "51:10": { "id:3": 331, "sizeX:3": 48, "sizeY:3": 48, "x:3": 168, "y:3": 420 }, - "51:10": { + "52:10": { "id:3": 332, "sizeX:3": 24, "sizeY:3": 24, "x:3": -216, "y:3": 384 }, - "52:10": { + "53:10": { "id:3": 333, "sizeX:3": 24, "sizeY:3": 24, "x:3": -180, "y:3": 384 }, - "53:10": { + "54:10": { "id:3": 334, "sizeX:3": 24, "sizeY:3": 24, "x:3": -144, "y:3": 384 }, - "54:10": { + "55:10": { "id:3": 335, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": 384 }, - "55:10": { + "56:10": { "id:3": 336, "sizeX:3": 24, "sizeY:3": 24, "x:3": -132, "y:3": 60 }, - "56:10": { + "57:10": { "id:3": 337, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": 108 }, - "57:10": { + "58:10": { "id:3": 342, "sizeX:3": 24, "sizeY:3": 24, "x:3": 72, "y:3": 148 }, - "58:10": { + "59:10": { "id:3": 345, "sizeX:3": 24, "sizeY:3": 24, "x:3": 164, "y:3": 108 }, - "59:10": { + "60:10": { "id:3": 351, "sizeX:3": 24, "sizeY:3": 24, "x:3": 60, "y:3": 312 }, - "60:10": { + "61:10": { "id:3": 389, "sizeX:3": 24, "sizeY:3": 24, "x:3": -312, "y:3": -48 }, - "61:10": { + "62:10": { "id:3": 406, "sizeX:3": 36, "sizeY:3": 36, "x:3": -318, "y:3": -6 }, - "62:10": { + "63:10": { "id:3": 407, "sizeX:3": 36, "sizeY:3": 36, "x:3": -378, "y:3": -104 }, - "63:10": { + "64:10": { "id:3": 408, "sizeX:3": 24, "sizeY:3": 24, "x:3": -264, "y:3": 0 }, - "64:10": { + "65:10": { "id:3": 411, "sizeX:3": 36, "sizeY:3": 36, "x:3": 66, "y:3": 258 }, - "65:10": { + "66:10": { "id:3": 417, "sizeX:3": 24, "sizeY:3": 24, "x:3": -96, "y:3": 60 }, - "66:10": { + "67:10": { "id:3": 519, "sizeX:3": 24, "sizeY:3": 24, "x:3": -216, "y:3": 432 }, - "67:10": { + "68:10": { "id:3": 523, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, "y:3": 0 }, - "68:10": { + "69:10": { "id:3": 524, "sizeX:3": 24, "sizeY:3": 24, "x:3": -480, "y:3": 0 }, - "69:10": { + "70:10": { "id:3": 525, "sizeX:3": 24, "sizeY:3": 24, "x:3": -576, "y:3": 0 }, - "70:10": { + "71:10": { + "id:3": 527, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -576, + "y:3": 216 + }, + "72:10": { "id:3": 529, "sizeX:3": 36, "sizeY:3": 36, "x:3": -486, "y:3": 53 }, - "71:10": { + "73:10": { "id:3": 531, "sizeX:3": 24, "sizeY:3": 24, "x:3": -480, "y:3": 216 }, - "72:10": { + "74:10": { "id:3": 533, "sizeX:3": 48, "sizeY:3": 48, "x:3": -120, "y:3": 300 }, - "73:10": { + "75:10": { "id:3": 534, "sizeX:3": 24, "sizeY:3": 24, "x:3": -264, "y:3": 312 }, - "74:10": { + "76:10": { "id:3": 535, "sizeX:3": 24, "sizeY:3": 24, "x:3": -180, "y:3": 312 }, - "75:10": { + "77:10": { "id:3": 536, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": 264 }, - "76:10": { + "78:10": { "id:3": 537, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 348 }, - "77:10": { + "79:10": { "id:3": 549, "sizeX:3": 48, "sizeY:3": 48, "x:3": 96, "y:3": 12 }, - "78:10": { + "80:10": { "id:3": 607, "sizeX:3": 48, "sizeY:3": 48, "x:3": 168, "y:3": 336 }, - "79:10": { + "81:10": { "id:3": 608, "sizeX:3": 24, "sizeY:3": 24, "x:3": -60, "y:3": 60 }, - "80:10": { + "82:10": { "id:3": 681, "sizeX:3": 32, "sizeY:3": 32, - "x:3": -12, - "y:3": 56 + "x:3": 32, + "y:3": 20 }, - "81:10": { + "83:10": { "id:3": 695, "sizeX:3": 24, "sizeY:3": 24, "x:3": -60, "y:3": 148 }, - "82:10": { + "84:10": { "id:3": 696, "sizeX:3": 24, "sizeY:3": 24, "x:3": -180, "y:3": 432 }, - "83:10": { + "85:10": { "id:3": 733, "sizeX:3": 24, "sizeY:3": 24, "x:3": -132, "y:3": 24 }, - "84:10": { + "86:10": { "id:3": 744, "sizeX:3": 24, "sizeY:3": 24, "x:3": -432, "y:3": 384 }, - "85:10": { + "87:10": { "id:3": 750, "sizeX:3": 24, "sizeY:3": 24, "x:3": -264, "y:3": 108 }, - "86:10": { + "88:10": { "id:3": 776, "sizeX:3": 24, "sizeY:3": 24, "x:3": 24, "y:3": 348 }, - "87:10": { + "89:10": { "id:3": 778, "sizeX:3": 24, "sizeY:3": 24, "x:3": 60, "y:3": 348 }, - "88:10": { + "90:10": { "id:3": 783, "sizeX:3": 0, "sizeY:3": 0, "x:3": -516, "y:3": 108 }, - "89:10": { + "91:10": { "id:3": 791, "sizeX:3": 36, "sizeY:3": 36, "x:3": -438, "y:3": -6 }, - "90:10": { + "92:10": { "id:3": 792, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -28, - "y:3": 24 + "x:3": 16, + "y:3": -12 }, - "91:10": { + "93:10": { "id:3": 793, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 12, - "y:3": 24 + "x:3": 56, + "y:3": -12 }, - "92:10": { + "94:10": { "id:3": 794, "sizeX:3": 0, "sizeY:3": 0, - "x:3": 4, - "y:3": 72 + "x:3": 48, + "y:3": 36 }, - "93:10": { + "95:10": { "id:3": 795, "sizeX:3": 24, "sizeY:3": 24, "x:3": -172, "y:3": 92 }, - "94:10": { + "96:10": { "id:3": 796, "sizeX:3": 24, "sizeY:3": 24, "x:3": -172, "y:3": 60 }, - "95:10": { + "97:10": { "id:3": 798, "sizeX:3": 24, "sizeY:3": 24, "x:3": -480, "y:3": -48 }, - "96:10": { + "98:10": { "id:3": 804, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, "y:3": 348 }, - "97:10": { + "99:10": { "id:3": 827, "sizeX:3": 32, "sizeY:3": 32, "x:3": -580, - "y:3": 260 + "y:3": 172 }, - "98:10": { + "100:10": { "id:3": 828, - "sizeX:3": 32, - "sizeY:3": 32, - "x:3": -436, - "y:3": -100 + "sizeX:3": 48, + "sizeY:3": 48, + "x:3": -444, + "y:3": -112 }, - "99:10": { + "101:10": { "id:3": 839, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 108 }, - "100:10": { + "102:10": { "id:3": 840, "sizeX:3": 24, "sizeY:3": 24, "x:3": -168, "y:3": 0 }, - "101:10": { + "103:10": { "id:3": 841, "sizeX:3": 24, "sizeY:3": 24, "x:3": -168, "y:3": -48 }, - "102:10": { + "104:10": { "id:3": 842, "sizeX:3": 24, "sizeY:3": 24, "x:3": -312, "y:3": 384 }, - "103:10": { + "105:10": { "id:3": 843, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": -216, - "y:3": 176 + "sizeX:3": 32, + "sizeY:3": 32, + "x:3": -220, + "y:3": 172 }, - "104:10": { + "106:10": { "id:3": 844, "sizeX:3": 24, "sizeY:3": 24, "x:3": -60, "y:3": 176 }, - "105:10": { + "107:10": { "id:3": 845, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 176 }, - "106:10": { + "108:10": { "id:3": 846, "sizeX:3": 24, "sizeY:3": 24, "x:3": -60, "y:3": 264 }, - "107:10": { + "109:10": { "id:3": 847, "sizeX:3": 32, "sizeY:3": 32, "x:3": -112, "y:3": 172 }, - "108:10": { + "110:10": { "id:3": 848, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": 220 }, - "109:10": { + "111:10": { "id:3": 850, "sizeX:3": 32, "sizeY:3": 32, "x:3": -436, "y:3": -52 }, - "110:10": { + "112:10": { "id:3": 851, "sizeX:3": 24, "sizeY:3": 24, "x:3": -264, "y:3": -48 }, - "111:10": { + "113:10": { "id:3": 853, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, - "y:3": 264 + "y:3": 216 }, - "112:10": { + "114:10": { "id:3": 855, "sizeX:3": 24, "sizeY:3": 24, "x:3": 220, "y:3": 364 }, - "113:10": { + "115:10": { "id:3": 856, "sizeX:3": 24, "sizeY:3": 24, "x:3": 220, "y:3": 396 }, - "114:10": { + "116:10": { "id:3": 860, "sizeX:3": 24, "sizeY:3": 24, "x:3": -432, "y:3": 216 }, - "115:10": { + "117:10": { "id:3": 861, "sizeX:3": 24, "sizeY:3": 24, "x:3": 220, "y:3": 332 }, - "116:10": { + "118:10": { "id:3": 881, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -180, - "y:3": 264 + "x:3": -528, + "y:3": 308 }, - "117:10": { + "119:10": { "id:3": 904, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 156 }, - "118:10": { + "120:10": { "id:3": 905, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, - "y:3": 204 + "y:3": 236 }, - "119:10": { + "121:10": { "id:3": 906, "sizeX:3": 24, "sizeY:3": 24, "x:3": -216, "y:3": 348 + }, + "122:10": { + "id:3": 907, + "sizeX:3": 0, + "sizeY:3": 0, + "x:3": -204, + "y:3": 396 + }, + "123:10": { + "id:3": 908, + "sizeX:3": 0, + "sizeY:3": 0, + "x:3": -96, + "y:3": 368 + }, + "124:10": { + "id:3": 910, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -576, + "y:3": 264 } } }, @@ -59905,7 +60123,7 @@ "id:3": 11, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 30, + "x:3": 73, "y:3": 222 }, "7:10": { @@ -60017,8 +60235,8 @@ "id:3": 58, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 36, - "y:3": 294 + "x:3": 30, + "y:3": 330 }, "23:10": { "id:3": 66, @@ -60144,7 +60362,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": 73, - "y:3": 222 + "y:3": 255 }, "41:10": { "id:3": 552, @@ -60229,6 +60447,13 @@ "sizeY:3": 24, "x:3": -228, "y:3": 132 + }, + "53:10": { + "id:3": 909, + "sizeX:3": 36, + "sizeY:3": 36, + "x:3": 67, + "y:3": 288 } } }, @@ -60710,8 +60935,8 @@ "id:3": 399, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -18, - "y:3": -36 + "x:3": -54, + "y:3": 36 }, "7:10": { "id:3": 607, @@ -60742,25 +60967,39 @@ "y:3": -36 }, "11:10": { + "id:3": 847, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -54, + "y:3": -36 + }, + "12:10": { "id:3": 852, "sizeX:3": 24, "sizeY:3": 24, "x:3": 56, "y:3": -36 }, - "12:10": { + "13:10": { "id:3": 854, "sizeX:3": 24, "sizeY:3": 24, "x:3": 56, "y:3": 36 }, - "13:10": { + "14:10": { "id:3": 885, "sizeX:3": 24, "sizeY:3": 24, "x:3": 18, "y:3": 36 + }, + "15:10": { + "id:3": 908, + "sizeX:3": 0, + "sizeY:3": 0, + "x:3": 66, + "y:3": 12 } } }, diff --git a/overrides/config/betterquesting/questbook.cfg b/overrides/config/betterquesting/questbook.cfg index dd4678c..9a57a2c 100644 --- a/overrides/config/betterquesting/questbook.cfg +++ b/overrides/config/betterquesting/questbook.cfg @@ -14,7 +14,7 @@ general { B:disableQuestNotifications=false # Enable this option so new players will spawn with a Quest Book. Default: false - B:spawnWithBook=true + B:spawnWithBook=false } diff --git a/overrides/resources/gregtech/lang/en_us.lang b/overrides/resources/gregtech/lang/en_us.lang new file mode 100644 index 0000000..28cdabb --- /dev/null +++ b/overrides/resources/gregtech/lang/en_us.lang @@ -0,0 +1 @@ +material.rhodium_plated_palladium=Rhodium Plated Lumium-Palladium \ No newline at end of file diff --git a/overrides/scripts/BlastFurnace.zs b/overrides/scripts/BlastFurnace.zs index 01775ad..00a6ba8 100644 --- a/overrides/scripts/BlastFurnace.zs +++ b/overrides/scripts/BlastFurnace.zs @@ -43,6 +43,7 @@ furnace.remove(, ); //blast_furnace.findRecipe(120, [], [ * 1000]).remove(); //blast_furnace.findRecipe(120, [], [ * 1000]).remove(); //blast_furnace.findRecipe(120, [], [ * 1000]).remove(); + // Steel Ingot * 1 .findRecipe(120, [], [ * 1000]).remove(); // Steel Ingot * 1 diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs index 248c392..132c2f7 100644 --- a/overrides/scripts/Earlygame.zs +++ b/overrides/scripts/Earlygame.zs @@ -130,7 +130,7 @@ recipes.remove(); //Black Quartz -electrolyzer.recipeBuilder().inputs([ * 4]).outputs([]).duration(400).EUt(90).buildAndRegister(); +centrifuge.recipeBuilder().inputs([ * 4]).outputs([]).duration(400).EUt(90).buildAndRegister(); autoclave.recipeBuilder().inputs([]).fluidInputs( * 1000).outputs([]).duration(150).EUt(16).buildAndRegister(); //Mechanical Crafter @@ -170,9 +170,9 @@ recipes.remove(); recipes.addShaped(, [[, , ]]); // Steel -alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(200).EUt(16).buildAndRegister(); -alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(200).EUt(16).buildAndRegister(); -alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(200).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(150).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(150).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(150).EUt(16).buildAndRegister(); //EIO Alloys alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(240).EUt(16).buildAndRegister(); alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(240).EUt(16).buildAndRegister(); @@ -1109,3 +1109,76 @@ electrolyzer.recipeBuilder() .duration(768) .EUt(30) .buildAndRegister(); + +// PBF nomified +furnace.remove(); +furnace.addRecipe(, , 0.5); +recipes.removeByRecipeName("gregtech:fireclay_dust"); +recipes.addShapeless("fireclay_dust", * 16, [, ]); + +// PBF recipe removals +// Steel Ingot * 1 +.findRecipe(1, [, ], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, ], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, * 2], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, * 2], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, * 2], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, * 2], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, ], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, ], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, * 2], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, * 2], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, * 2], null).remove(); +// Steel Ingot * 1 +.findRecipe(1, [, * 2], null).remove(); +// Block of Steel * 1 +.findRecipe(1, [, ], null).remove(); +// Block of Steel * 1 +.findRecipe(1, [, * 2], null).remove(); +// Block of Steel * 1 +.findRecipe(1, [, * 2], null).remove(); +// Block of Steel * 1 +.findRecipe(1, [, ], null).remove(); +// Block of Steel * 1 +.findRecipe(1, [, * 2], null).remove(); +// Block of Steel * 1 +.findRecipe(1, [, * 2], null).remove(); + +// PBF recipes + +primitive_blast_furnace.recipeBuilder() + .inputs([, ]) + .outputs([, * 2]) + .duration(400) + .EUt(1) + .buildAndRegister(); +primitive_blast_furnace.recipeBuilder() + .inputs([, ]) + .outputs([, * 2]) + .duration(400) + .EUt(1) + .buildAndRegister(); +primitive_blast_furnace.recipeBuilder() + .inputs([, ]) + .outputs([, * 2]) + .duration(400) + .EUt(1) + .buildAndRegister(); +primitive_blast_furnace.recipeBuilder() + .inputs([, ]) + .outputs([, * 2]) + .duration(400) + .EUt(1) + .buildAndRegister(); + + diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs index 500fa8a..cd16dc9 100644 --- a/overrides/scripts/Endgame.zs +++ b/overrides/scripts/Endgame.zs @@ -231,34 +231,35 @@ fusion_reactor.recipeBuilder() .property("eu_to_start", 400000000) .buildAndRegister(); -// LuV Machine Casing -recipes.remove(); - -// LuV Machine Hull -recipes.remove(); - -recipes.addShaped(, [ - [, , ], - [, , ]]); - -assembler.findRecipe(16, - [.firstItem * 8, - .withTag({Configuration: 8})], - [null]).remove(); - -assembler.recipeBuilder() - .inputs( * 8) - .outputs([]) - .duration(30).EUt(16).buildAndRegister(); +//// LuV Machine Casing +//recipes.remove(); +// +//// LuV Machine Hull +//recipes.remove(); +// +//recipes.addShaped(, [ +// [, , ], +// [, , ]]); +// +//assembler.findRecipe(16, +// [.firstItem * 8, +// .withTag({Configuration: 8})], +// [null]).remove(); +// +//assembler.recipeBuilder() +// .inputs( * 8) +// .outputs([]) +// .duration(30).EUt(16).buildAndRegister(); +// //Rare Earth -// Redstone * 1 -.findRecipe(24, [], null).remove(); - -centrifuge.recipeBuilder() - .inputs() - .outputs([, ]) - .duration(900).EUt(24).buildAndRegister(); +//// Redstone * 1 +//.findRecipe(24, [], null).remove(); +// +//centrifuge.recipeBuilder() +// .inputs() +// .outputs([, ]) +// .duration(900).EUt(24).buildAndRegister(); //Bismuth @@ -483,4 +484,46 @@ assembly_line.recipeBuilder() .outputs() .duration(600) .EUt(24000) + .buildAndRegister(); + +// Rhodium Plated Palladium +// Rhodium Plated Palladium Dust * 4 +.findRecipe(7680, [ * 3, , .withTag({Configuration: 1})], null).remove(); +mixer.recipeBuilder() + .inputs([ * 3, , * 2]) + .circuit(1) + .outputs( * 6) + .duration(400) + .EUt(7680) + .buildAndRegister(); + +// Palladium Dust * 3 +.findRecipe(30, [ * 4], null).remove(); +centrifuge.recipeBuilder() + .inputs( * 6) + .outputs([ * 3, , * 2]) + .duration(630) + .EUt(30) + .buildAndRegister(); + +// Molten Rhodium Plated Palladium * 576 +.findRecipe(7680, [ * 3, , .withTag({Configuration: 12})], [ * 200]).remove(); +// Molten Rhodium Plated Palladium * 576 +.findRecipe(7680, [ * 3, , .withTag({Configuration: 2})], null).remove(); +alloy_blast_smelter.recipeBuilder() + .inputs([ * 3, , * 2]) + .circuit(3) + .fluidOutputs( * 864) + .property("temperature", 4500) + .duration(3600) + .EUt(7680) + .buildAndRegister(); +alloy_blast_smelter.recipeBuilder() + .inputs([ * 3, , * 2]) + .fluidInputs( * 300) + .circuit(13) + .fluidOutputs( * 864) + .property("temperature", 4500) + .duration(2412) + .EUt(7680) .buildAndRegister(); \ No newline at end of file diff --git a/overrides/scripts/Midgame.zs b/overrides/scripts/Midgame.zs index fc5a0d8..b2f6a2e 100644 --- a/overrides/scripts/Midgame.zs +++ b/overrides/scripts/Midgame.zs @@ -3,6 +3,20 @@ import crafttweaker.item.IItemStack; import crafttweaker.item.IIngredient; import crafttweaker.data.IData; +recipes.remove(); +recipes.addShaped("test", , [ + [null, , null], + [, .marked("satchel"), ], + [, null, ]], + function(out, ins, cInfo) { + var tag = {} as IData; + # This if is here to keep the tinkers workbench from screwing up JEI autocomplete + if(ins has "satchel" && !isNull(ins.satchel) && ins.satchel.hasTag) { + tag = ins.satchel.tag; + } + return out.withTag(tag); +}, null); + //Ender Star recipes.remove(); reactor.recipeBuilder().inputs([]).fluidInputs([ * 8000]).outputs().EUt(400).duration(2000).buildAndRegister(); @@ -19,13 +33,13 @@ fermenter.recipeBuilder().fluidInputs([ * 100]).fluidOutputs([ //Canola chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 1000, * 6000]).fluidOutputs([ * 1000, * 6000,]).duration(300).EUt(30).buildAndRegister(); -//chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 1000, * 6000]).fluidOutputs([ * 1000, * 6000,]).duration(300).EUt(30).buildAndRegister(); +chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 1000, * 6000]).fluidOutputs([ * 1000, * 6000,]).duration(300).EUt(30).buildAndRegister(); chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 750, * 4500]).fluidOutputs([ * 1000, * 6000,]).duration(300).EUt(30).buildAndRegister(); -//chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 750, * 4500]).fluidOutputs([ * 1000, * 6000,]).duration(300).EUt(30).buildAndRegister(); +chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 750, * 4500]).fluidOutputs([ * 1000, * 6000,]).duration(300).EUt(30).buildAndRegister(); chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 500, * 3000]).fluidOutputs([ * 1000, * 6000]).duration(300).EUt(30).buildAndRegister(); -//chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 500, * 3000]).fluidOutputs([ * 1000, * 6000]).duration(300).EUt(30).buildAndRegister(); +chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 500, * 3000]).fluidOutputs([ * 1000, * 6000]).duration(300).EUt(30).buildAndRegister(); chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 250, * 1500]).fluidOutputs([ * 1000, * 6000]).duration(300).EUt(30).buildAndRegister(); -//chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 250, * 1500]).fluidOutputs([ * 1000, * 6000]).duration(300).EUt(30).buildAndRegister(); +chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 250, * 1500]).fluidOutputs([ * 1000, * 6000]).duration(300).EUt(30).buildAndRegister(); chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 1000]).fluidOutputs([ * 1000]).duration(100).EUt(120).buildAndRegister(); chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 1000]).fluidOutputs([ * 1000]).duration(100).EUt(500).buildAndRegister(); @@ -49,7 +63,25 @@ centrifuge.findRecipe(20, [], [ * 160]).remove(); centrifuge.recipeBuilder().fluidInputs( * 500).fluidOutputs([ * 10]).duration(800).EUt(30).buildAndRegister(); centrifuge.recipeBuilder().inputs().fluidOutputs([ * 100]).duration(200).EUt(20).buildAndRegister(); -//centrifuge.recipeBuilder().inputs( * 3).outputs([ * 2]).duration(40).EUt(20).buildAndRegister(); +//// Stone Dust +//centrifuge.recipeBuilder() +// .inputs( * 3) +// .outputs([ * 2]) +// .circuit(2) +// .duration(40).EUt(20) +// .buildAndRegister(); +// +//// Small Pile of Quartzite Dust * 1 +//.findRecipe(120, [], null).remove(); +//centrifuge.recipeBuilder() +// .inputs() +// .circuit(1) +// .outputs([, , * 2, ]) +// .chancedOutput(, 5000, 500) +// .chancedOutput(, 7500, 750) +// .duration(480) +// .EUt(120) +// .buildAndRegister(); //Gear Boxes Via Assembler //assembler.recipeBuilder() @@ -118,4 +150,8 @@ macerator.recipeBuilder() .EUt(2) .buildAndRegister(); - \ No newline at end of file +canner.recipeBuilder() + .inputs() + .fluidInputs( * 500) + .outputs() + .duration(1500).EUt(4).buildAndRegister(); \ No newline at end of file diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs index 33c1435..fa76c5e 100644 --- a/overrides/scripts/_oreDict.zs +++ b/overrides/scripts/_oreDict.zs @@ -1863,7 +1863,7 @@ mods.jei.JEI.removeAndHide(); //mods.jei.JEI.removeAndHide(); //mods.jei.JEI.removeAndHide(); //mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); +//mods.jei.JEI.removeAndHide(); //mods.jei.JEI.removeAndHide(); //mods.jei.JEI.removeAndHide(); //mods.jei.JEI.removeAndHide(); diff --git a/overrides/scripts/aa xu2.zs b/overrides/scripts/aa xu2.zs index 9c47d02..c7b79cf 100644 --- a/overrides/scripts/aa xu2.zs +++ b/overrides/scripts/aa xu2.zs @@ -153,52 +153,52 @@ recipes.addShaped(furnGen, [ [,,]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_survival"}), [ - [, , ], - [, , ], + [, , ], + [, , ], [redPlate, furnGen, redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_culinary"}), [ - [, , ], + [, , ], [, , ], [redPlate, .withTag({Type: "extrautils2:generator_slime"}), redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_lava"}), [ - [, , ], + [, , ], [, , ], [redPlate, furnGen, redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_redstone"}), [ - [redPlate, , redPlate], - [redPlate, , redPlate], + [, , ], + [, , ], [redPlate, .withTag({Type: "extrautils2:generator_lava"}), redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_ender"}), [ - [, , ], + [, , ], [, , ], [redPlate, furnGen, redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_potion"}), [ - [,,], - [,,], + [,,], + [,,], [redPlate, furnGen, redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_pink"}), [ - [, , ], - [, , ], + [, , ], + [, , ], [redPlate, .withTag({Type: "extrautils2:generator_potion"}), redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_overclock"}), [ - [,,], - [,,], + [,,], + [,,], [redPlate, .withTag({Type: "extrautils2:generator_tnt"}), redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_tnt"}), [ - [,,], - [,,], + [,,], + [,,], [redPlate, furnGen, redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_slime"}), [ - [,,], + [,,], [,,], [redPlate, furnGen, redPlate]]); @@ -208,18 +208,18 @@ recipes.addShaped(.withTag({Type: "extrautils2:generator_de [redPlate, .withTag({Type: "extrautils2:generator_ice"}), redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_enchant"}), [ - [,,], - [,,], + [,,], + [,,], [redPlate, .withTag({Type: "extrautils2:generator_potion"}), redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_dragonsbreath"}), [ - [, , ], + [, , ], [, , ], [redPlate, .withTag({Type: "extrautils2:generator_tnt"}), redPlate]]); recipes.addShaped(.withTag({Type: "extrautils2:generator_ice"}), [ - [,,], - [,,], + [,,], + [,,], [redPlate, furnGen, redPlate]]); recipes.addShaped(, [ diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs index 947cf07..dcba1bf 100644 --- a/overrides/scripts/electronics.zs +++ b/overrides/scripts/electronics.zs @@ -164,19 +164,19 @@ makeShaped("of_microverse_casing", * 2, { P : , //Microversium Ingot W : wrench}); -// LuV Machine Casing -makeShaped("of_luv_casing", , - ["PPP", - "PWP", - "PPP"], - { P : , //Lumium Plate - W : wrench}); +//// LuV Machine Casing +//makeShaped("of_luv_casing", , +// ["PPP", +// "PWP", +// "PPP"], +// { P : , //Lumium Plate +// W : wrench}); -//LV Hull -recipes.remove(); -recipes.addShaped(, [ - [, , ], - [, , ]]); +////LV Hull +//recipes.remove(); +//recipes.addShaped(, [ +// [, , ], +// [, , ]]); // remove steel LV Motor recipes recipes.removeByRecipeName("gregtech:electric_motor_lv_steel"); @@ -198,29 +198,29 @@ recipes.addShaped(, [ [, , ], [, , ]]); -// LV Casing -recipes.removeByRecipeName("gregtech:casing.lv"); -recipes.addShaped(, [ - [, , ], - [, , ], - [, , ] -]); -// LV Machine Casing * 1 -.findRecipe(16, [ * 8, .withTag({Configuration: 8})], null).remove(); -assembler.recipeBuilder().inputs( * 8).notConsumable(.withTag({Configuration: 8})).outputs([]).duration(30).EUt(16).buildAndRegister(); - -// ULV Casing -recipes.removeByRecipeName("gregtech:casing_ulv"); - -recipes.addShaped(, [ - [, , ], - [, , ], - [, , ] -]); -// ULV Machine Casing * 1 -.findRecipe(16, [ * 8, .withTag({Configuration: 8})], null).remove(); - -assembler.recipeBuilder().inputs( * 8).notConsumable(.withTag({Configuration: 8})).outputs([]).duration(30).EUt(16).buildAndRegister(); +//// LV Casing +//recipes.removeByRecipeName("gregtech:casing.lv"); +//recipes.addShaped(, [ +// [, , ], +// [, , ], +// [, , ] +//]); +//// LV Machine Casing * 1 +//.findRecipe(16, [ * 8, .withTag({Configuration: 8})], null).remove(); +//assembler.recipeBuilder().inputs( * 8).notConsumable(.withTag({Configuration: 8})).outputs([]).duration(30).EUt(16).buildAndRegister(); +// +//// ULV Casing +//recipes.removeByRecipeName("gregtech:casing_ulv"); +// +//recipes.addShaped(, [ +// [, , ], +// [, , ], +// [, , ] +//]); +//// ULV Machine Casing * 1 +//.findRecipe(16, [ * 8, .withTag({Configuration: 8})], null).remove(); +// +//assembler.recipeBuilder().inputs( * 8).notConsumable(.withTag({Configuration: 8})).outputs([]).duration(30).EUt(16).buildAndRegister(); // pyro @@ -285,19 +285,19 @@ chemical_reactor.recipeBuilder().inputs().fluidInputs([.findRecipe(7, [, ], [ * 50]).remove(); // make t1 circuits craftable w/o steam -recipes.removeByRecipeName("gregtech:electronic_circuit_lv"); -recipes.addShaped(, [ - [, , ], - [, , ], - [, , ] -]); - -recipes.removeByRecipeName("gregtech:vacuum_tube"); -recipes.addShaped(, [ - [null, null, null], - [, , ], - [, , ] -]); +//recipes.removeByRecipeName("gregtech:electronic_circuit_lv"); +//recipes.addShaped(, [ +// [, , ], +// [, , ], +// [, , ] +//]); +// +//recipes.removeByRecipeName("gregtech:vacuum_tube"); +//recipes.addShaped(, [ +// [null, null, null], +// [, , ], +// [, , ] +//]); recipes.addShaped(, [ [null, null, null], diff --git a/overrides/scripts/extendedcrafting.zs b/overrides/scripts/extendedcrafting.zs index 2d7163d..fc6a6bc 100644 --- a/overrides/scripts/extendedcrafting.zs +++ b/overrides/scripts/extendedcrafting.zs @@ -919,10 +919,10 @@ makeExtremeRecipe9(, { A : , B : , C : , - D : , - E : , - F : , - G : , + D : , + E : , + F : , + G : , H : , I : }); diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs index 31e0be7..6013eb4 100644 --- a/overrides/scripts/materials.zs +++ b/overrides/scripts/materials.zs @@ -184,7 +184,7 @@ var soularium = MaterialBuilder(32024, "soularium") var end_steel = MaterialBuilder(32025, "end_steel") .ingot().fluid() .color(0xd6d980).iconSet("metallic") - .flags("generate_plate") + .flags("generate_plate", "generate_gear") .cableProperties(2048,1,0,true) .build(); @@ -267,6 +267,7 @@ var iridosmine_8020 = MaterialBuilder(32030, "iridosmine_8020") .setFormula("Au(Ca3(PO4)2)", true); .setFormula("Au2(Si(FeS2)5(CrAl2O3)Hg3)(Au(Ca3(PO4)2))", true); .setFormula("(AuAgCu3)2Fe3?4", true); +.setFormula("((SnFe)4(CuAg4)2)2Pd3Rh", true); //.setOreByProducts([]); //.setOreByProducts([, ]);