From 32bd3ccf105140ead32a460747f0fdeac7264579 Mon Sep 17 00:00:00 2001 From: m2r1k5 <61507029+m2r1k5@users.noreply.github.com> Date: Mon, 24 Jan 2022 23:52:03 +0800 Subject: [PATCH] 0.2 --- config/AppliedEnergistics2/CustomRecipes.cfg | 2 +- config/AppliedEnergistics2/VersionChecker.cfg | 2 +- config/AppliedEnergistics2/items.csv | 780 ++++++++++-------- config/InvTweaks.cfg | 2 +- config/JustEnoughCalculation/record.json | 16 +- config/brandon3055/CustomFusionRecipes.json | 48 +- config/gregtech.cfg | 4 +- config/jei/worldSettings.cfg | 2 +- config/phosphor.json | 3 +- config/splash.properties | 2 +- manifest.json | 2 +- modlist.html | 2 +- resources/contenttweaker/lang/en_us.lang | 12 +- scripts/Armors.zs | 12 +- scripts/BlastFurnace.zs | 20 +- scripts/DraconicEvolution.zs | 196 ++--- scripts/Earlygame.zs | 97 ++- scripts/EnderIO.zs | 188 ++--- scripts/Midgame.zs | 8 + scripts/ThermalExpansion.zs | 196 ++--- scripts/_oreDict.zs | 93 ++- scripts/electronics.zs | 191 ++++- scripts/extendedcrafting.zs | 34 +- scripts/materials.zs | 26 +- scripts/multiblocks.zs | 4 +- 25 files changed, 1146 insertions(+), 796 deletions(-) diff --git a/config/AppliedEnergistics2/CustomRecipes.cfg b/config/AppliedEnergistics2/CustomRecipes.cfg index 757f766..4471029 100644 --- a/config/AppliedEnergistics2/CustomRecipes.cfg +++ b/config/AppliedEnergistics2/CustomRecipes.cfg @@ -1,7 +1,7 @@ # Configuration file cache { - S:digest=0f589f496221d7874de0a6fff541b733 + S:digest=2c95f4c87a7d635067bae18b94404e59 # Caching can save processing time, if there are a lot of items. [default: true] B:enableCache=true diff --git a/config/AppliedEnergistics2/VersionChecker.cfg b/config/AppliedEnergistics2/VersionChecker.cfg index a6a9bb9..fc0f0b9 100644 --- a/config/AppliedEnergistics2/VersionChecker.cfg +++ b/config/AppliedEnergistics2/VersionChecker.cfg @@ -3,7 +3,7 @@ cache { # Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24] I:interval=24 - S:lastCheck=1642937155568 + S:lastCheck=1643029063811 } diff --git a/config/AppliedEnergistics2/items.csv b/config/AppliedEnergistics2/items.csv index 81ac757..0b0f258 100644 --- a/config/AppliedEnergistics2/items.csv +++ b/config/AppliedEnergistics2/items.csv @@ -4932,6 +4932,7 @@ advancedrocketry:beaconfinder, Beacon Finder advancedrocketry:thermite, Thermite advancedrocketry:hovercraft, HoverCraft forge:bucketfilled, %s Bucket +baubles:ring:0, Miner's Ring advsolars:sunnarium, Sunnarium advsolars:sunnarium_enriched, Enriched Sunnarium advsolars:sunnarium_plate, Sunnarium Plate @@ -5518,6 +5519,7 @@ appliedenergistics2:facade:0, Cable Facade - Ender Floor I appliedenergistics2:facade:0, Cable Facade - Ender Floor II appliedenergistics2:facade:0, Cable Facade - Ender Floor I (Trap) appliedenergistics2:facade:0, Cable Facade - Ender Pillar +appliedenergistics2:facade:0, Cable Facade - Dense Construction Block appliedenergistics2:facade:0, Cable Facade - Block of Aluminum appliedenergistics2:facade:0, Cable Facade - Block of Aluminum appliedenergistics2:facade:0, Cable Facade - Block of Aluminum @@ -7704,23 +7706,11 @@ appliedenergistics2:facade:0, Cable Facade - Rubber Wood appliedenergistics2:facade:0, Cable Facade - Rubber Tree Leaves appliedenergistics2:facade:0, Cable Facade - Rubber Wood Planks appliedenergistics2:facade:0, Cable Facade - Treated Wood Planks -appliedenergistics2:facade:0, Cable Facade - Block of Aluminium -appliedenergistics2:facade:0, Cable Facade - Block of Americium -appliedenergistics2:facade:0, Cable Facade - Block of Antimony -appliedenergistics2:facade:0, Cable Facade - Block of Berkelium -appliedenergistics2:facade:0, Cable Facade - Block of Beryllium -appliedenergistics2:facade:0, Cable Facade - Block of Bismuth -appliedenergistics2:facade:0, Cable Facade - Block of Caesium -appliedenergistics2:facade:0, Cable Facade - Block of Soldering Alloy -appliedenergistics2:facade:0, Cable Facade - Block of Spessartine -appliedenergistics2:facade:0, Cable Facade - Block of Stainless Steel -appliedenergistics2:facade:0, Cable Facade - Block of Steel -appliedenergistics2:facade:0, Cable Facade - Block of Tin Alloy -appliedenergistics2:facade:0, Cable Facade - Block of Topaz -appliedenergistics2:facade:0, Cable Facade - Block of Ultimet -appliedenergistics2:facade:0, Cable Facade - Block of Uvarovite -appliedenergistics2:facade:0, Cable Facade - Block of Vanadium-Gallium -appliedenergistics2:facade:0, Cable Facade - Block of Wrought Iron +appliedenergistics2:facade:0, Cable Facade - Block of Tantalum Carbide +appliedenergistics2:facade:0, Cable Facade - Block of Molybdenum Disilicide +appliedenergistics2:facade:0, Cable Facade - Block of HSLA Steel +appliedenergistics2:facade:0, Cable Facade - Block of Titanium Tungsten Carbide +appliedenergistics2:facade:0, Cable Facade - Block of Incoloy-MA956 appliedenergistics2:facade:0, Cable Facade - Block of Lumium appliedenergistics2:facade:0, Cable Facade - Block of Enderium appliedenergistics2:facade:0, Cable Facade - Block of material.electrum_flux @@ -7731,31 +7721,19 @@ appliedenergistics2:facade:0, Cable Facade - Block of material.soularium appliedenergistics2:facade:0, Cable Facade - Block of End Steel appliedenergistics2:facade:0, Cable Facade - Block of material.infinity appliedenergistics2:facade:0, Cable Facade - Block of Microversium -appliedenergistics2:facade:0, Cable Facade - Block of Tritanium -appliedenergistics2:facade:0, Cable Facade - Block of Duranium -appliedenergistics2:facade:0, Cable Facade - Block of Trinium -appliedenergistics2:facade:0, Cable Facade - Block of Tantalum Carbide -appliedenergistics2:facade:0, Cable Facade - Block of Molybdenum Disilicide -appliedenergistics2:facade:0, Cable Facade - Block of HSLA Steel -appliedenergistics2:facade:0, Cable Facade - Block of Titanium Tungsten Carbide -appliedenergistics2:facade:0, Cable Facade - Block of Incoloy-MA956 -appliedenergistics2:facade:0, Cable Facade - Block of Yttrium Barium Cuprate -appliedenergistics2:facade:0, Cable Facade - Block of Quartzite -appliedenergistics2:facade:0, Cable Facade - Block of Graphite -appliedenergistics2:facade:0, Cable Facade - Block of Graphene -appliedenergistics2:facade:0, Cable Facade - Block of Osmiridium -appliedenergistics2:facade:0, Cable Facade - Block of Gallium Arsenide -appliedenergistics2:facade:0, Cable Facade - Block of Magnetic Steel -appliedenergistics2:facade:0, Cable Facade - Block of Vanadiumsteel -appliedenergistics2:facade:0, Cable Facade - Block of Potin -appliedenergistics2:facade:0, Cable Facade - Block of Borosilicate Glass -appliedenergistics2:facade:0, Cable Facade - Block of Naquadah Alloy +appliedenergistics2:facade:0, Cable Facade - Block of material.draconic_superconductor appliedenergistics2:facade:0, Cable Facade - Block of Platinum appliedenergistics2:facade:0, Cable Facade - Block of Plutonium 239 appliedenergistics2:facade:0, Cable Facade - Block of Plutonium 241 appliedenergistics2:facade:0, Cable Facade - Block of Rhodium appliedenergistics2:facade:0, Cable Facade - Block of Ruthenium appliedenergistics2:facade:0, Cable Facade - Block of Samarium +appliedenergistics2:facade:0, Cable Facade - Block of Battery Alloy +appliedenergistics2:facade:0, Cable Facade - Block of Blue Topaz +appliedenergistics2:facade:0, Cable Facade - Block of Brass +appliedenergistics2:facade:0, Cable Facade - Block of Bronze +appliedenergistics2:facade:0, Cable Facade - Block of Charcoal +appliedenergistics2:facade:0, Cable Facade - Block of Cinnabar appliedenergistics2:facade:0, Cable Facade - Block of Tin appliedenergistics2:facade:0, Cable Facade - Block of Titanium appliedenergistics2:facade:0, Cable Facade - Block of Tungsten @@ -7768,12 +7746,42 @@ appliedenergistics2:facade:0, Cable Facade - Block of Naquadah appliedenergistics2:facade:0, Cable Facade - Block of Enriched Naquadah appliedenergistics2:facade:0, Cable Facade - Block of Naquadria appliedenergistics2:facade:0, Cable Facade - Block of Neutronium -appliedenergistics2:facade:0, Cable Facade - Block of Cupronickel -appliedenergistics2:facade:0, Cable Facade - Block of Electrum -appliedenergistics2:facade:0, Cable Facade - Block of Green Sapphire -appliedenergistics2:facade:0, Cable Facade - Block of Grossular -appliedenergistics2:facade:0, Cable Facade - Block of Rutile -appliedenergistics2:facade:0, Cable Facade - Block of Invar +appliedenergistics2:facade:0, Cable Facade - Block of Yttrium Barium Cuprate +appliedenergistics2:facade:0, Cable Facade - Block of Quartzite +appliedenergistics2:facade:0, Cable Facade - Block of Graphene +appliedenergistics2:facade:0, Cable Facade - Block of Osmiridium +appliedenergistics2:facade:0, Cable Facade - Block of Gallium Arsenide +appliedenergistics2:facade:0, Cable Facade - Block of Polyphenylene Sulfide +appliedenergistics2:facade:0, Cable Facade - Block of Polybenzimidazole (PBI) +appliedenergistics2:facade:0, Cable Facade - Block of Polyethylene (PE) +appliedenergistics2:facade:0, Cable Facade - Block of Epoxy Resin +appliedenergistics2:facade:0, Cable Facade - Block of Polycaprolactam +appliedenergistics2:facade:0, Cable Facade - Block of Polytetrafluoroethylene (PTFE) +appliedenergistics2:facade:0, Cable Facade - Block of Sugar +appliedenergistics2:facade:0, Cable Facade - Block of Olivine +appliedenergistics2:facade:0, Cable Facade - Block of Opal +appliedenergistics2:facade:0, Cable Facade - Block of Amethyst +appliedenergistics2:facade:0, Cable Facade - Block of Apatite +appliedenergistics2:facade:0, Cable Facade - Block of Black Steel +appliedenergistics2:facade:0, Cable Facade - Block of Damascus Steel +appliedenergistics2:facade:0, Cable Facade - Block of Tungstensteel +appliedenergistics2:facade:0, Cable Facade - Block of Cobalt Brass +appliedenergistics2:facade:0, Cable Facade - Block of Red Garnet +appliedenergistics2:facade:0, Cable Facade - Block of Yellow Garnet +appliedenergistics2:facade:0, Cable Facade - Block of Monazite +appliedenergistics2:facade:0, Cable Facade - Block of Tritanium +appliedenergistics2:facade:0, Cable Facade - Block of Duranium +appliedenergistics2:facade:0, Cable Facade - Block of Trinium +appliedenergistics2:facade:0, Cable Facade - Block of Soldering Alloy +appliedenergistics2:facade:0, Cable Facade - Block of Spessartine +appliedenergistics2:facade:0, Cable Facade - Block of Stainless Steel +appliedenergistics2:facade:0, Cable Facade - Block of Steel +appliedenergistics2:facade:0, Cable Facade - Block of Tin Alloy +appliedenergistics2:facade:0, Cable Facade - Block of Topaz +appliedenergistics2:facade:0, Cable Facade - Block of Ultimet +appliedenergistics2:facade:0, Cable Facade - Block of Uvarovite +appliedenergistics2:facade:0, Cable Facade - Block of Vanadium-Gallium +appliedenergistics2:facade:0, Cable Facade - Block of Wrought Iron appliedenergistics2:facade:0, Cable Facade - Block of Californium appliedenergistics2:facade:0, Cable Facade - Block of Chrome appliedenergistics2:facade:0, Cable Facade - Block of Cobalt @@ -7781,18 +7789,17 @@ appliedenergistics2:facade:0, Cable Facade - Block of Copper appliedenergistics2:facade:0, Cable Facade - Block of Curium appliedenergistics2:facade:0, Cable Facade - Block of Darmstadtium appliedenergistics2:facade:0, Cable Facade - Block of Einsteinium -appliedenergistics2:facade:0, Cable Facade - Block of Endereye -appliedenergistics2:facade:0, Cable Facade - Block of Red Steel -appliedenergistics2:facade:0, Cable Facade - Block of Blue Steel -appliedenergistics2:facade:0, Cable Facade - Block of Battery Alloy -appliedenergistics2:facade:0, Cable Facade - Block of Blue Topaz -appliedenergistics2:facade:0, Cable Facade - Block of Brass -appliedenergistics2:facade:0, Cable Facade - Block of Bronze -appliedenergistics2:facade:0, Cable Facade - Block of Charcoal -appliedenergistics2:facade:0, Cable Facade - Block of Cinnabar -appliedenergistics2:facade:0, Cable Facade - Block of Malachite -appliedenergistics2:facade:0, Cable Facade - Block of Magnetic Iron -appliedenergistics2:facade:0, Cable Facade - Block of Tungstencarbide +appliedenergistics2:facade:0, Cable Facade - Block of Enderpearl +appliedenergistics2:facade:0, Cable Facade - Block of Magnetic Neodymium +appliedenergistics2:facade:0, Cable Facade - Block of Magnetic Samarium +appliedenergistics2:facade:0, Cable Facade - Block of Manganese Phosphide +appliedenergistics2:facade:0, Cable Facade - Block of Magnesium Diboride +appliedenergistics2:facade:0, Cable Facade - Block of Mercury Barium Calcium Cuprate +appliedenergistics2:facade:0, Cable Facade - Block of Uranium Triplatinum +appliedenergistics2:facade:0, Cable Facade - Block of Samarium Iron Arsenic Oxide +appliedenergistics2:facade:0, Cable Facade - Block of Indium Tin Barium Titanium Cuprate +appliedenergistics2:facade:0, Cable Facade - Block of Uranium Rhodium Dinaquadide +appliedenergistics2:facade:0, Cable Facade - Block of Enriched Naquadah Trinium Europium Duranide appliedenergistics2:facade:0, Cable Facade - Block of material.fluix appliedenergistics2:facade:0, Cable Facade - Block of Draconium appliedenergistics2:facade:0, Cable Facade - Block of material.awakened_draconium @@ -7807,26 +7814,6 @@ appliedenergistics2:facade:0, Cable Facade - Block of Energetic Alloy appliedenergistics2:facade:0, Cable Facade - Block of Vibrant Alloy appliedenergistics2:facade:0, Cable Facade - Block of Pulsating Iron appliedenergistics2:facade:0, Cable Facade - Block of Electrical Steel -appliedenergistics2:facade:0, Cable Facade - Block of Europium -appliedenergistics2:facade:0, Cable Facade - Block of Gallium -appliedenergistics2:facade:0, Cable Facade - Block of Silicon -appliedenergistics2:facade:0, Cable Facade - Block of Silver -appliedenergistics2:facade:0, Cable Facade - Block of Tantalum -appliedenergistics2:facade:0, Cable Facade - Block of Thorium -appliedenergistics2:facade:0, Cable Facade - Block of Enderpearl -appliedenergistics2:facade:0, Cable Facade - Block of Magnetic Neodymium -appliedenergistics2:facade:0, Cable Facade - Block of Magnetic Samarium -appliedenergistics2:facade:0, Cable Facade - Block of Manganese Phosphide -appliedenergistics2:facade:0, Cable Facade - Block of Magnesium Diboride -appliedenergistics2:facade:0, Cable Facade - Block of Mercury Barium Calcium Cuprate -appliedenergistics2:facade:0, Cable Facade - Block of Uranium Triplatinum -appliedenergistics2:facade:0, Cable Facade - Block of Samarium Iron Arsenic Oxide -appliedenergistics2:facade:0, Cable Facade - Block of Indium Tin Barium Titanium Cuprate -appliedenergistics2:facade:0, Cable Facade - Block of Uranium Rhodium Dinaquadide -appliedenergistics2:facade:0, Cable Facade - Block of Enriched Naquadah Trinium Europium Duranide -appliedenergistics2:facade:0, Cable Facade - Block of Indium Gallium Phosphide -appliedenergistics2:facade:0, Cable Facade - Block of Nickel Zinc Ferrite -appliedenergistics2:facade:0, Cable Facade - Block of Realgar appliedenergistics2:facade:0, Cable Facade - Block of Pyrope appliedenergistics2:facade:0, Cable Facade - Block of Rock Salt appliedenergistics2:facade:0, Cable Facade - Block of Ruridit @@ -7845,9 +7832,6 @@ appliedenergistics2:facade:0, Cable Facade - Block of Sterling Silver appliedenergistics2:facade:0, Cable Facade - Block of Rose Gold appliedenergistics2:facade:0, Cable Facade - Block of Black Bronze appliedenergistics2:facade:0, Cable Facade - Block of Bismuth Bronze -appliedenergistics2:facade:0, Cable Facade - Block of Red Garnet -appliedenergistics2:facade:0, Cable Facade - Block of Yellow Garnet -appliedenergistics2:facade:0, Cable Facade - Block of Monazite appliedenergistics2:facade:0, Cable Facade - Block of Stellite-100 appliedenergistics2:facade:0, Cable Facade - Block of Watertight Steel appliedenergistics2:facade:0, Cable Facade - Block of Maraging Steel 300 @@ -7856,23 +7840,19 @@ appliedenergistics2:facade:0, Cable Facade - Block of Hastelloy-X appliedenergistics2:facade:0, Cable Facade - Block of Trinaquadalloy appliedenergistics2:facade:0, Cable Facade - Block of Zeron-100 appliedenergistics2:facade:0, Cable Facade - Block of Titanium Carbide -appliedenergistics2:facade:0, Cable Facade - Block of HSS-G -appliedenergistics2:facade:0, Cable Facade - Block of Red Alloy -appliedenergistics2:facade:0, Cable Facade - Block of HSS-E -appliedenergistics2:facade:0, Cable Facade - Block of HSS-S -appliedenergistics2:facade:0, Cable Facade - Block of Blue Alloy -appliedenergistics2:facade:0, Cable Facade - Block of Olivine -appliedenergistics2:facade:0, Cable Facade - Block of Opal -appliedenergistics2:facade:0, Cable Facade - Block of Amethyst -appliedenergistics2:facade:0, Cable Facade - Block of Apatite -appliedenergistics2:facade:0, Cable Facade - Block of Black Steel -appliedenergistics2:facade:0, Cable Facade - Block of Damascus Steel -appliedenergistics2:facade:0, Cable Facade - Block of Tungstensteel -appliedenergistics2:facade:0, Cable Facade - Block of Cobalt Brass -appliedenergistics2:facade:0, Cable Facade - Block of Silicone Rubber -appliedenergistics2:facade:0, Cable Facade - Block of Styrene-Butadiene Rubber -appliedenergistics2:facade:0, Cable Facade - Block of Fiber-Reinforced Epoxy Resin -appliedenergistics2:facade:0, Cable Facade - Block of Polyvinyl Chloride (PVC) +appliedenergistics2:facade:0, Cable Facade - Block of Cupronickel +appliedenergistics2:facade:0, Cable Facade - Block of Electrum +appliedenergistics2:facade:0, Cable Facade - Block of Green Sapphire +appliedenergistics2:facade:0, Cable Facade - Block of Grossular +appliedenergistics2:facade:0, Cable Facade - Block of Rutile +appliedenergistics2:facade:0, Cable Facade - Block of Invar +appliedenergistics2:facade:0, Cable Facade - Block of Almandine +appliedenergistics2:facade:0, Cable Facade - Block of Andradite +appliedenergistics2:facade:0, Cable Facade - Block of Annealed Copper +appliedenergistics2:facade:0, Cable Facade - Block of Certus Quartz +appliedenergistics2:facade:0, Cable Facade - Block of Malachite +appliedenergistics2:facade:0, Cable Facade - Block of Magnetic Iron +appliedenergistics2:facade:0, Cable Facade - Block of Tungstencarbide appliedenergistics2:facade:0, Cable Facade - Block of Molybdenum appliedenergistics2:facade:0, Cable Facade - Block of Neodymium appliedenergistics2:facade:0, Cable Facade - Block of Neptunium @@ -7880,55 +7860,77 @@ appliedenergistics2:facade:0, Cable Facade - Block of Nickel appliedenergistics2:facade:0, Cable Facade - Block of Niobium appliedenergistics2:facade:0, Cable Facade - Block of Osmium appliedenergistics2:facade:0, Cable Facade - Block of Palladium -appliedenergistics2:facade:0, Cable Facade - Block of Almandine -appliedenergistics2:facade:0, Cable Facade - Block of Andradite -appliedenergistics2:facade:0, Cable Facade - Block of Annealed Copper -appliedenergistics2:facade:0, Cable Facade - Block of Flint -appliedenergistics2:facade:0, Cable Facade - Block of Rhodium Plated Palladium -appliedenergistics2:facade:0, Cable Facade - Block of Certus Quartz +appliedenergistics2:facade:0, Cable Facade - Block of Indium Gallium Phosphide +appliedenergistics2:facade:0, Cable Facade - Block of Nickel Zinc Ferrite +appliedenergistics2:facade:0, Cable Facade - Block of Realgar +appliedenergistics2:facade:0, Cable Facade - Block of HSS-G +appliedenergistics2:facade:0, Cable Facade - Block of Red Alloy +appliedenergistics2:facade:0, Cable Facade - Block of HSS-E +appliedenergistics2:facade:0, Cable Facade - Block of HSS-S +appliedenergistics2:facade:0, Cable Facade - Block of Blue Alloy +appliedenergistics2:facade:0, Cable Facade - Block of Silicone Rubber +appliedenergistics2:facade:0, Cable Facade - Block of Styrene-Butadiene Rubber +appliedenergistics2:facade:0, Cable Facade - Block of Fiber-Reinforced Epoxy Resin +appliedenergistics2:facade:0, Cable Facade - Block of Polyvinyl Chloride (PVC) +appliedenergistics2:facade:0, Cable Facade - Block of Endereye +appliedenergistics2:facade:0, Cable Facade - Block of Red Steel +appliedenergistics2:facade:0, Cable Facade - Block of Blue Steel appliedenergistics2:facade:0, Cable Facade - Block of Indium appliedenergistics2:facade:0, Cable Facade - Block of Iridium appliedenergistics2:facade:0, Cable Facade - Block of Lead appliedenergistics2:facade:0, Cable Facade - Block of Manganese -appliedenergistics2:facade:0, Cable Facade - Block of Polyphenylene Sulfide -appliedenergistics2:facade:0, Cable Facade - Block of Polybenzimidazole (PBI) -appliedenergistics2:facade:0, Cable Facade - Block of Polyethylene (PE) -appliedenergistics2:facade:0, Cable Facade - Block of Epoxy Resin -appliedenergistics2:facade:0, Cable Facade - Block of Polycaprolactam -appliedenergistics2:facade:0, Cable Facade - Block of Polytetrafluoroethylene (PTFE) -appliedenergistics2:facade:0, Cable Facade - Block of Sugar -appliedenergistics2:facade:0, Cable Facade - Block of Nether Star +appliedenergistics2:facade:0, Cable Facade - Block of Europium +appliedenergistics2:facade:0, Cable Facade - Block of Gallium appliedenergistics2:facade:0, Cable Facade - Block of Ruthenium Trinium Americium Neutronate +appliedenergistics2:facade:0, Cable Facade - Block of Silicon +appliedenergistics2:facade:0, Cable Facade - Block of Silver +appliedenergistics2:facade:0, Cable Facade - Block of Tantalum +appliedenergistics2:facade:0, Cable Facade - Block of Thorium +appliedenergistics2:facade:0, Cable Facade - Block of Aluminium +appliedenergistics2:facade:0, Cable Facade - Block of Americium +appliedenergistics2:facade:0, Cable Facade - Block of Antimony +appliedenergistics2:facade:0, Cable Facade - Block of Berkelium +appliedenergistics2:facade:0, Cable Facade - Block of Beryllium +appliedenergistics2:facade:0, Cable Facade - Block of Bismuth +appliedenergistics2:facade:0, Cable Facade - Block of Caesium +appliedenergistics2:facade:0, Cable Facade - Block of Flint +appliedenergistics2:facade:0, Cable Facade - Block of Rhodium Plated Palladium +appliedenergistics2:facade:0, Cable Facade - Block of Magnetic Steel +appliedenergistics2:facade:0, Cable Facade - Block of Vanadiumsteel +appliedenergistics2:facade:0, Cable Facade - Block of Potin +appliedenergistics2:facade:0, Cable Facade - Block of Borosilicate Glass +appliedenergistics2:facade:0, Cable Facade - Block of Naquadah Alloy +appliedenergistics2:facade:0, Cable Facade - Block of Nether Star appliedenergistics2:facade:0, Cable Facade - Block of Rubber -appliedenergistics2:facade:0, Cable Facade - Microversium Frame Box -appliedenergistics2:facade:0, Cable Facade - Brass Frame Box -appliedenergistics2:facade:0, Cable Facade - Bronze Frame Box -appliedenergistics2:facade:0, Cable Facade - Stainless Steel Frame Box -appliedenergistics2:facade:0, Cable Facade - Steel Frame Box -appliedenergistics2:facade:0, Cable Facade - Tungstencarbide Frame Box -appliedenergistics2:facade:0, Cable Facade - Titanium Frame Box -appliedenergistics2:facade:0, Cable Facade - Tungsten Frame Box -appliedenergistics2:facade:0, Cable Facade - Neutronium Frame Box -appliedenergistics2:facade:0, Cable Facade - Tritanium Frame Box -appliedenergistics2:facade:0, Cable Facade - Wood Frame Box -appliedenergistics2:facade:0, Cable Facade - Treated Wood Frame Box -appliedenergistics2:facade:0, Cable Facade - Aluminium Frame Box -appliedenergistics2:facade:0, Cable Facade - HSLA Steel Frame Box -appliedenergistics2:facade:0, Cable Facade - Incoloy-MA956 Frame Box -appliedenergistics2:facade:0, Cable Facade - Naquadah Alloy Frame Box -appliedenergistics2:facade:0, Cable Facade - Invar Frame Box -appliedenergistics2:facade:0, Cable Facade - HSS-G Frame Box -appliedenergistics2:facade:0, Cable Facade - HSS-E Frame Box -appliedenergistics2:facade:0, Cable Facade - HSS-S Frame Box -appliedenergistics2:facade:0, Cable Facade - Polytetrafluoroethylene (PTFE) Frame Box -appliedenergistics2:facade:0, Cable Facade - Blue Steel Frame Box appliedenergistics2:facade:0, Cable Facade - Watertight Steel Frame Box appliedenergistics2:facade:0, Cable Facade - Maraging Steel 300 Frame Box appliedenergistics2:facade:0, Cable Facade - Hastelloy-C276 Frame Box appliedenergistics2:facade:0, Cable Facade - Hastelloy-X Frame Box -appliedenergistics2:facade:0, Cable Facade - Europium Frame Box +appliedenergistics2:facade:0, Cable Facade - HSLA Steel Frame Box +appliedenergistics2:facade:0, Cable Facade - Incoloy-MA956 Frame Box +appliedenergistics2:facade:0, Cable Facade - Tungstencarbide Frame Box +appliedenergistics2:facade:0, Cable Facade - HSS-G Frame Box +appliedenergistics2:facade:0, Cable Facade - HSS-E Frame Box +appliedenergistics2:facade:0, Cable Facade - HSS-S Frame Box appliedenergistics2:facade:0, Cable Facade - Tungstensteel Frame Box appliedenergistics2:facade:0, Cable Facade - Dark Steel Frame Box +appliedenergistics2:facade:0, Cable Facade - Stainless Steel Frame Box +appliedenergistics2:facade:0, Cable Facade - Steel Frame Box +appliedenergistics2:facade:0, Cable Facade - Polytetrafluoroethylene (PTFE) Frame Box +appliedenergistics2:facade:0, Cable Facade - Naquadah Alloy Frame Box +appliedenergistics2:facade:0, Cable Facade - Titanium Frame Box +appliedenergistics2:facade:0, Cable Facade - Tungsten Frame Box +appliedenergistics2:facade:0, Cable Facade - Neutronium Frame Box +appliedenergistics2:facade:0, Cable Facade - Europium Frame Box +appliedenergistics2:facade:0, Cable Facade - Wood Frame Box +appliedenergistics2:facade:0, Cable Facade - Tritanium Frame Box +appliedenergistics2:facade:0, Cable Facade - Aluminium Frame Box +appliedenergistics2:facade:0, Cable Facade - Brass Frame Box +appliedenergistics2:facade:0, Cable Facade - Bronze Frame Box +appliedenergistics2:facade:0, Cable Facade - Treated Wood Frame Box +appliedenergistics2:facade:0, Cable Facade - Blue Steel Frame Box +appliedenergistics2:facade:0, Cable Facade - Microversium Frame Box +appliedenergistics2:facade:0, Cable Facade - Invar Frame Box appliedenergistics2:facade:0, Cable Facade - Crushing Wheels appliedenergistics2:facade:0, Cable Facade - Slicing Blades appliedenergistics2:facade:0, Cable Facade - Electrolytic Cell @@ -8210,15 +8212,14 @@ appliedenergistics2:part:220, ME Storage Bus appliedenergistics2:part:400, ME Storage Monitor appliedenergistics2:part:380, ME Terminal appliedenergistics2:part:80, ME Toggle Bus -baubles:ring:0, Miner's Ring enderio:item_enderface, Enderface enderio:item_conduit_facade:0, Conduit Facade enderio:item_conduit_facade:1, Hardened Conduit Facade enderio:item_conduit_facade:2, Transparent Conduit Facade enderio:item_conduit_facade:3, Transparent Hardened Conduit Facade -enderio:item_basic_capacitor:0, Basic Capacitor -enderio:item_basic_capacitor:1, Double-Layer Capacitor -enderio:item_basic_capacitor:2, Octadic Capacitor +enderio:item_basic_capacitor:0, Basic RF Capacitor +enderio:item_basic_capacitor:1, Double-Layer RF Capacitor +enderio:item_basic_capacitor:2, Octadic RF Capacitor enderio:block_alloy:0, Electrical Steel Block enderio:block_alloy:1, Energetic Alloy Block enderio:block_alloy:2, Vibrant Alloy Block @@ -9283,9 +9284,9 @@ enderio:item_item_conduit:0, Item Conduit enderio:item_liquid_conduit:0, Fluid Conduit enderio:item_liquid_conduit:1, Pressurized Fluid Conduit enderio:item_liquid_conduit:2, Ender Fluid Conduit -enderio:item_power_conduit:0, Energy Conduit -enderio:item_power_conduit:1, Enhanced Energy Conduit -enderio:item_power_conduit:2, Ender Energy Conduit +enderio:item_power_conduit:0, Conductive Iron Energy Conduit +enderio:item_power_conduit:1, Energetic Alloy Energy Conduit +enderio:item_power_conduit:2, Vibrant Alloy Energy Conduit enderio:item_redstone_conduit:0, Redstone Conduit enderio:item_extract_speed_upgrade:0, Extract Speed Upgrade enderio:item_extract_speed_downgrade:0, Extract Speed Downgrade @@ -9393,18 +9394,18 @@ enderio:item_capacitor_crystalline, Crystalline Capacitor enderio:item_capacitor_melodic, Melodic Capacitor enderio:item_capacitor_stellar, Stellar Capacitor enderio:item_capacitor_totemic, Totemic Capacitor -enderio:item_endergy_conduit:0, Crude Energy Conduit -enderio:item_endergy_conduit:1, Iron Energy Conduit +enderio:item_endergy_conduit:0, Enderium Energy Conduit +enderio:item_endergy_conduit:1, End Steel Energy Conduit enderio:item_endergy_conduit:2, Aluminium Energy Conduit enderio:item_endergy_conduit:3, Gold Energy Conduit -enderio:item_endergy_conduit:4, Copper Energy Conduit +enderio:item_endergy_conduit:4, Signalum Energy Conduit enderio:item_endergy_conduit:5, Silver Energy Conduit -enderio:item_endergy_conduit:6, Electrum Energy Conduit +enderio:item_endergy_conduit:6, Lumium Energy Conduit enderio:item_endergy_conduit:7, Energetic Silver Energy Conduit enderio:item_endergy_conduit:8, Crystalline Energy Conduit enderio:item_endergy_conduit:9, Crystalline Pink Slime Energy Conduit -enderio:item_endergy_conduit:10, Melodic Energy Conduit -enderio:item_endergy_conduit:11, Stellar Energy Conduit +enderio:item_endergy_conduit:10, Draconium Energy Conduit +enderio:item_endergy_conduit:11, Superconductor Energy Conduit enderio:item_capacitor_silver, Silver Capacitor enderio:item_capacitor_energetic_silver, Endergetic Silver Capacitor enderio:item_capacitor_vivid, Endergised Capacitor @@ -9721,6 +9722,21 @@ betterquesting:extra_life:1, Half Heart betterquesting:extra_life:2, Quarter Heart betterquesting:guide_book, Better Questing Starter Guide betterquesting:submit_station, Object Submission Station (OSS) +buildinggadgets:buildingtool, Building Gadget +buildinggadgets:exchangertool, Exchanging Gadget +buildinggadgets:copypastetool, Copy-Paste Gadget +buildinggadgets:templatemanager, Template Manager +buildinggadgets:template, Template +buildinggadgets:destructiontool, Destruction Gadget +buildinggadgets:constructionblock_dense, Dense Construction Block +buildinggadgets:constructionblock, Construction Block +buildinggadgets:constructionblockpowder, Construction Block Powder +buildinggadgets:constructionpaste, Construction Paste +buildinggadgets:construction_chunk_dense, Dense Construction Chunk +buildinggadgets:constructionpastecontainer, Paste Container +buildinggadgets:constructionpastecontainert2, Paste Container T2 +buildinggadgets:constructionpastecontainert3, Paste Container T3 +buildinggadgets:constructionpastecontainercreative, Creative Paste Container chisel:auto_chisel, Auto Chisel chisel:chisel_iron, Chisel chisel:chisel_diamond, Diamond Chisel @@ -10545,13 +10561,13 @@ gregtech:machine:2060, Master Voltage Control Unit gregtech:machine:2061, Ultimate Voltage Control Unit gregtech:machine:2062, Super Voltage Control Unit gregtech:machine:2063, Infinite Voltage Control Unit -gregtech:machine:32000, Basic Microverse Projector -gregtech:machine:32001, Advanced Microverse Projector -gregtech:machine:32002, Advanced Microverse Projector II -gregtech:machine:32003, Creative Tank Provider -gregtech:machine:32004, multiblocktweaker.machine.naquadah_reactor_1.name -gregtech:machine:32005, multiblocktweaker.machine.naquadah_reactor_2.name -gregtech:machine:32006, multiblocktweaker.machine.large_lapidary_dynamo.name +gregtech:machine:32000, mbt.machine.microverse_projector_basic.name +gregtech:machine:32001, mbt.machine.microverse_projector_advanced.name +gregtech:machine:32002, mbt.machine.microverse_projector_advanced_ii.name +gregtech:machine:32003, mbt.machine.creative_tank_provider.name +gregtech:machine:32004, Naquadah Reactor 1 +gregtech:machine:32005, Naquadah Reactor 2 +gregtech:machine:32006, Large Lapidary Dynamo gregtech:wire_single:2, 1x Aluminium Wire gregtech:wire_single:252, 1x Annealed Copper Wire gregtech:wire_single:2011, 1x Black Steel Wire @@ -10560,8 +10576,10 @@ gregtech:wire_single:23, 1x Cobalt Wire gregtech:wire_single:32011, 1x Conductive Iron Wire gregtech:wire_single:25, 1x Copper Wire gregtech:wire_single:274, 1x Cupronickel Wire +gregtech:wire_single:32028, 1x material.draconic_superconductor Wire gregtech:wire_single:32001, 1x Draconium Wire gregtech:wire_single:277, 1x Electrum Wire +gregtech:wire_single:32025, 1x End Steel Wire gregtech:wire_single:32018, 1x Enderium Wire gregtech:wire_single:32012, 1x Energetic Alloy Wire gregtech:wire_single:431, 1x Enriched Naquadah Trinium Europium Duranide Wire @@ -10611,8 +10629,10 @@ gregtech:wire_double:23, 2x Cobalt Wire gregtech:wire_double:32011, 2x Conductive Iron Wire gregtech:wire_double:25, 2x Copper Wire gregtech:wire_double:274, 2x Cupronickel Wire +gregtech:wire_double:32028, 2x material.draconic_superconductor Wire gregtech:wire_double:32001, 2x Draconium Wire gregtech:wire_double:277, 2x Electrum Wire +gregtech:wire_double:32025, 2x End Steel Wire gregtech:wire_double:32018, 2x Enderium Wire gregtech:wire_double:32012, 2x Energetic Alloy Wire gregtech:wire_double:431, 2x Enriched Naquadah Trinium Europium Duranide Wire @@ -10662,8 +10682,10 @@ gregtech:wire_quadruple:23, 4x Cobalt Wire gregtech:wire_quadruple:32011, 4x Conductive Iron Wire gregtech:wire_quadruple:25, 4x Copper Wire gregtech:wire_quadruple:274, 4x Cupronickel Wire +gregtech:wire_quadruple:32028, 4x material.draconic_superconductor Wire gregtech:wire_quadruple:32001, 4x Draconium Wire gregtech:wire_quadruple:277, 4x Electrum Wire +gregtech:wire_quadruple:32025, 4x End Steel Wire gregtech:wire_quadruple:32018, 4x Enderium Wire gregtech:wire_quadruple:32012, 4x Energetic Alloy Wire gregtech:wire_quadruple:431, 4x Enriched Naquadah Trinium Europium Duranide Wire @@ -10713,8 +10735,10 @@ gregtech:wire_octal:23, 8x Cobalt Wire gregtech:wire_octal:32011, 8x Conductive Iron Wire gregtech:wire_octal:25, 8x Copper Wire gregtech:wire_octal:274, 8x Cupronickel Wire +gregtech:wire_octal:32028, 8x material.draconic_superconductor Wire gregtech:wire_octal:32001, 8x Draconium Wire gregtech:wire_octal:277, 8x Electrum Wire +gregtech:wire_octal:32025, 8x End Steel Wire gregtech:wire_octal:32018, 8x Enderium Wire gregtech:wire_octal:32012, 8x Energetic Alloy Wire gregtech:wire_octal:431, 8x Enriched Naquadah Trinium Europium Duranide Wire @@ -10764,8 +10788,10 @@ gregtech:wire_hex:23, 16x Cobalt Wire gregtech:wire_hex:32011, 16x Conductive Iron Wire gregtech:wire_hex:25, 16x Copper Wire gregtech:wire_hex:274, 16x Cupronickel Wire +gregtech:wire_hex:32028, 16x material.draconic_superconductor Wire gregtech:wire_hex:32001, 16x Draconium Wire gregtech:wire_hex:277, 16x Electrum Wire +gregtech:wire_hex:32025, 16x End Steel Wire gregtech:wire_hex:32018, 16x Enderium Wire gregtech:wire_hex:32012, 16x Energetic Alloy Wire gregtech:wire_hex:431, 16x Enriched Naquadah Trinium Europium Duranide Wire @@ -11160,108 +11186,108 @@ gregtech:fluid_pipe_nonuple:396, Nonuple Tungstencarbide Fluid Pipe gregtech:fluid_pipe_nonuple:2013, Nonuple Tungstensteel Fluid Pipe gregtech:fluid_pipe_nonuple:2036, Nonuple Vanadiumsteel Fluid Pipe gregtech:fluid_pipe_nonuple:335, Nonuple Wrought Iron Fluid Pipe -gregtech:item_pipe_small:75, Small Osmium Item Pipe -gregtech:item_pipe_small:259, Small Brass Item Pipe -gregtech:item_pipe_small:3, Small Americium Item Pipe -gregtech:item_pipe_small:277, Small Electrum Item Pipe gregtech:item_pipe_small:80, Small Platinum Item Pipe -gregtech:item_pipe_small:2014, Small Cobalt Brass Item Pipe -gregtech:item_pipe_small:1007, Small Polyvinyl Chloride (PVC) Item Pipe gregtech:item_pipe_small:300, Small Sterling Silver Item Pipe -gregtech:item_pipe_small:331, Small Ultimet Item Pipe -gregtech:item_pipe_small:344, Small Osmiridium Item Pipe -gregtech:item_pipe_small:112, Small Tin Item Pipe -gregtech:item_pipe_small:69, Small Nickel Item Pipe -gregtech:item_pipe_small:302, Small Black Bronze Item Pipe -gregtech:item_pipe_small:301, Small Rose Gold Item Pipe -gregtech:item_pipe_small:290, Small Magnalium Item Pipe gregtech:item_pipe_small:274, Small Cupronickel Item Pipe +gregtech:item_pipe_small:301, Small Rose Gold Item Pipe +gregtech:item_pipe_small:3, Small Americium Item Pipe +gregtech:item_pipe_small:344, Small Osmiridium Item Pipe +gregtech:item_pipe_small:331, Small Ultimet Item Pipe +gregtech:item_pipe_small:290, Small Magnalium Item Pipe gregtech:item_pipe_small:23, Small Cobalt Item Pipe -gregtech:item_pipe_normal:75, Osmium Item Pipe -gregtech:item_pipe_normal:259, Brass Item Pipe -gregtech:item_pipe_normal:3, Americium Item Pipe -gregtech:item_pipe_normal:277, Electrum Item Pipe +gregtech:item_pipe_small:277, Small Electrum Item Pipe +gregtech:item_pipe_small:259, Small Brass Item Pipe +gregtech:item_pipe_small:1007, Small Polyvinyl Chloride (PVC) Item Pipe +gregtech:item_pipe_small:302, Small Black Bronze Item Pipe +gregtech:item_pipe_small:2014, Small Cobalt Brass Item Pipe +gregtech:item_pipe_small:75, Small Osmium Item Pipe +gregtech:item_pipe_small:69, Small Nickel Item Pipe +gregtech:item_pipe_small:112, Small Tin Item Pipe gregtech:item_pipe_normal:80, Platinum Item Pipe -gregtech:item_pipe_normal:2014, Cobalt Brass Item Pipe -gregtech:item_pipe_normal:1007, Polyvinyl Chloride (PVC) Item Pipe gregtech:item_pipe_normal:300, Sterling Silver Item Pipe -gregtech:item_pipe_normal:331, Ultimet Item Pipe -gregtech:item_pipe_normal:344, Osmiridium Item Pipe -gregtech:item_pipe_normal:112, Tin Item Pipe -gregtech:item_pipe_normal:69, Nickel Item Pipe -gregtech:item_pipe_normal:302, Black Bronze Item Pipe -gregtech:item_pipe_normal:301, Rose Gold Item Pipe -gregtech:item_pipe_normal:290, Magnalium Item Pipe gregtech:item_pipe_normal:274, Cupronickel Item Pipe +gregtech:item_pipe_normal:301, Rose Gold Item Pipe +gregtech:item_pipe_normal:3, Americium Item Pipe +gregtech:item_pipe_normal:344, Osmiridium Item Pipe +gregtech:item_pipe_normal:331, Ultimet Item Pipe +gregtech:item_pipe_normal:290, Magnalium Item Pipe gregtech:item_pipe_normal:23, Cobalt Item Pipe -gregtech:item_pipe_large:75, Large Osmium Item Pipe -gregtech:item_pipe_large:259, Large Brass Item Pipe -gregtech:item_pipe_large:3, Large Americium Item Pipe -gregtech:item_pipe_large:277, Large Electrum Item Pipe +gregtech:item_pipe_normal:277, Electrum Item Pipe +gregtech:item_pipe_normal:259, Brass Item Pipe +gregtech:item_pipe_normal:1007, Polyvinyl Chloride (PVC) Item Pipe +gregtech:item_pipe_normal:302, Black Bronze Item Pipe +gregtech:item_pipe_normal:2014, Cobalt Brass Item Pipe +gregtech:item_pipe_normal:75, Osmium Item Pipe +gregtech:item_pipe_normal:69, Nickel Item Pipe +gregtech:item_pipe_normal:112, Tin Item Pipe gregtech:item_pipe_large:80, Large Platinum Item Pipe -gregtech:item_pipe_large:2014, Large Cobalt Brass Item Pipe -gregtech:item_pipe_large:1007, Large Polyvinyl Chloride (PVC) Item Pipe gregtech:item_pipe_large:300, Large Sterling Silver Item Pipe -gregtech:item_pipe_large:331, Large Ultimet Item Pipe -gregtech:item_pipe_large:344, Large Osmiridium Item Pipe -gregtech:item_pipe_large:112, Large Tin Item Pipe -gregtech:item_pipe_large:69, Large Nickel Item Pipe -gregtech:item_pipe_large:302, Large Black Bronze Item Pipe -gregtech:item_pipe_large:301, Large Rose Gold Item Pipe -gregtech:item_pipe_large:290, Large Magnalium Item Pipe gregtech:item_pipe_large:274, Large Cupronickel Item Pipe +gregtech:item_pipe_large:301, Large Rose Gold Item Pipe +gregtech:item_pipe_large:3, Large Americium Item Pipe +gregtech:item_pipe_large:344, Large Osmiridium Item Pipe +gregtech:item_pipe_large:331, Large Ultimet Item Pipe +gregtech:item_pipe_large:290, Large Magnalium Item Pipe gregtech:item_pipe_large:23, Large Cobalt Item Pipe -gregtech:item_pipe_small_restrictive:75, Small Restrictive Osmium Item Pipe -gregtech:item_pipe_small_restrictive:259, Small Restrictive Brass Item Pipe -gregtech:item_pipe_small_restrictive:3, Small Restrictive Americium Item Pipe -gregtech:item_pipe_small_restrictive:277, Small Restrictive Electrum Item Pipe +gregtech:item_pipe_large:277, Large Electrum Item Pipe +gregtech:item_pipe_large:259, Large Brass Item Pipe +gregtech:item_pipe_large:1007, Large Polyvinyl Chloride (PVC) Item Pipe +gregtech:item_pipe_large:302, Large Black Bronze Item Pipe +gregtech:item_pipe_large:2014, Large Cobalt Brass Item Pipe +gregtech:item_pipe_large:75, Large Osmium Item Pipe +gregtech:item_pipe_large:69, Large Nickel Item Pipe +gregtech:item_pipe_large:112, Large Tin Item Pipe gregtech:item_pipe_small_restrictive:80, Small Restrictive Platinum Item Pipe -gregtech:item_pipe_small_restrictive:2014, Small Restrictive Cobalt Brass Item Pipe -gregtech:item_pipe_small_restrictive:1007, Small Restrictive Polyvinyl Chloride (PVC) Item Pipe gregtech:item_pipe_small_restrictive:300, Small Restrictive Sterling Silver Item Pipe -gregtech:item_pipe_small_restrictive:331, Small Restrictive Ultimet Item Pipe -gregtech:item_pipe_small_restrictive:344, Small Restrictive Osmiridium Item Pipe -gregtech:item_pipe_small_restrictive:112, Small Restrictive Tin Item Pipe -gregtech:item_pipe_small_restrictive:69, Small Restrictive Nickel Item Pipe -gregtech:item_pipe_small_restrictive:302, Small Restrictive Black Bronze Item Pipe -gregtech:item_pipe_small_restrictive:301, Small Restrictive Rose Gold Item Pipe -gregtech:item_pipe_small_restrictive:290, Small Restrictive Magnalium Item Pipe gregtech:item_pipe_small_restrictive:274, Small Restrictive Cupronickel Item Pipe +gregtech:item_pipe_small_restrictive:301, Small Restrictive Rose Gold Item Pipe +gregtech:item_pipe_small_restrictive:3, Small Restrictive Americium Item Pipe +gregtech:item_pipe_small_restrictive:344, Small Restrictive Osmiridium Item Pipe +gregtech:item_pipe_small_restrictive:331, Small Restrictive Ultimet Item Pipe +gregtech:item_pipe_small_restrictive:290, Small Restrictive Magnalium Item Pipe gregtech:item_pipe_small_restrictive:23, Small Restrictive Cobalt Item Pipe -gregtech:item_pipe_normal_restrictive:75, Restrictive Osmium Item Pipe -gregtech:item_pipe_normal_restrictive:259, Restrictive Brass Item Pipe -gregtech:item_pipe_normal_restrictive:3, Restrictive Americium Item Pipe -gregtech:item_pipe_normal_restrictive:277, Restrictive Electrum Item Pipe +gregtech:item_pipe_small_restrictive:277, Small Restrictive Electrum Item Pipe +gregtech:item_pipe_small_restrictive:259, Small Restrictive Brass Item Pipe +gregtech:item_pipe_small_restrictive:1007, Small Restrictive Polyvinyl Chloride (PVC) Item Pipe +gregtech:item_pipe_small_restrictive:302, Small Restrictive Black Bronze Item Pipe +gregtech:item_pipe_small_restrictive:2014, Small Restrictive Cobalt Brass Item Pipe +gregtech:item_pipe_small_restrictive:75, Small Restrictive Osmium Item Pipe +gregtech:item_pipe_small_restrictive:69, Small Restrictive Nickel Item Pipe +gregtech:item_pipe_small_restrictive:112, Small Restrictive Tin Item Pipe gregtech:item_pipe_normal_restrictive:80, Restrictive Platinum Item Pipe -gregtech:item_pipe_normal_restrictive:2014, Restrictive Cobalt Brass Item Pipe -gregtech:item_pipe_normal_restrictive:1007, Restrictive Polyvinyl Chloride (PVC) Item Pipe gregtech:item_pipe_normal_restrictive:300, Restrictive Sterling Silver Item Pipe -gregtech:item_pipe_normal_restrictive:331, Restrictive Ultimet Item Pipe -gregtech:item_pipe_normal_restrictive:344, Restrictive Osmiridium Item Pipe -gregtech:item_pipe_normal_restrictive:112, Restrictive Tin Item Pipe -gregtech:item_pipe_normal_restrictive:69, Restrictive Nickel Item Pipe -gregtech:item_pipe_normal_restrictive:302, Restrictive Black Bronze Item Pipe -gregtech:item_pipe_normal_restrictive:301, Restrictive Rose Gold Item Pipe -gregtech:item_pipe_normal_restrictive:290, Restrictive Magnalium Item Pipe gregtech:item_pipe_normal_restrictive:274, Restrictive Cupronickel Item Pipe +gregtech:item_pipe_normal_restrictive:301, Restrictive Rose Gold Item Pipe +gregtech:item_pipe_normal_restrictive:3, Restrictive Americium Item Pipe +gregtech:item_pipe_normal_restrictive:344, Restrictive Osmiridium Item Pipe +gregtech:item_pipe_normal_restrictive:331, Restrictive Ultimet Item Pipe +gregtech:item_pipe_normal_restrictive:290, Restrictive Magnalium Item Pipe gregtech:item_pipe_normal_restrictive:23, Restrictive Cobalt Item Pipe -gregtech:item_pipe_large_restrictive:75, Large Restrictive Osmium Item Pipe -gregtech:item_pipe_large_restrictive:259, Large Restrictive Brass Item Pipe -gregtech:item_pipe_large_restrictive:3, Large Restrictive Americium Item Pipe -gregtech:item_pipe_large_restrictive:277, Large Restrictive Electrum Item Pipe +gregtech:item_pipe_normal_restrictive:277, Restrictive Electrum Item Pipe +gregtech:item_pipe_normal_restrictive:259, Restrictive Brass Item Pipe +gregtech:item_pipe_normal_restrictive:1007, Restrictive Polyvinyl Chloride (PVC) Item Pipe +gregtech:item_pipe_normal_restrictive:302, Restrictive Black Bronze Item Pipe +gregtech:item_pipe_normal_restrictive:2014, Restrictive Cobalt Brass Item Pipe +gregtech:item_pipe_normal_restrictive:75, Restrictive Osmium Item Pipe +gregtech:item_pipe_normal_restrictive:69, Restrictive Nickel Item Pipe +gregtech:item_pipe_normal_restrictive:112, Restrictive Tin Item Pipe gregtech:item_pipe_large_restrictive:80, Large Restrictive Platinum Item Pipe -gregtech:item_pipe_large_restrictive:2014, Large Restrictive Cobalt Brass Item Pipe -gregtech:item_pipe_large_restrictive:1007, Large Restrictive Polyvinyl Chloride (PVC) Item Pipe gregtech:item_pipe_large_restrictive:300, Large Restrictive Sterling Silver Item Pipe -gregtech:item_pipe_large_restrictive:331, Large Restrictive Ultimet Item Pipe -gregtech:item_pipe_large_restrictive:344, Large Restrictive Osmiridium Item Pipe -gregtech:item_pipe_large_restrictive:112, Large Restrictive Tin Item Pipe -gregtech:item_pipe_large_restrictive:69, Large Restrictive Nickel Item Pipe -gregtech:item_pipe_large_restrictive:302, Large Restrictive Black Bronze Item Pipe -gregtech:item_pipe_large_restrictive:301, Large Restrictive Rose Gold Item Pipe -gregtech:item_pipe_large_restrictive:290, Large Restrictive Magnalium Item Pipe gregtech:item_pipe_large_restrictive:274, Large Restrictive Cupronickel Item Pipe +gregtech:item_pipe_large_restrictive:301, Large Restrictive Rose Gold Item Pipe +gregtech:item_pipe_large_restrictive:3, Large Restrictive Americium Item Pipe +gregtech:item_pipe_large_restrictive:344, Large Restrictive Osmiridium Item Pipe +gregtech:item_pipe_large_restrictive:331, Large Restrictive Ultimet Item Pipe +gregtech:item_pipe_large_restrictive:290, Large Restrictive Magnalium Item Pipe gregtech:item_pipe_large_restrictive:23, Large Restrictive Cobalt Item Pipe +gregtech:item_pipe_large_restrictive:277, Large Restrictive Electrum Item Pipe +gregtech:item_pipe_large_restrictive:259, Large Restrictive Brass Item Pipe +gregtech:item_pipe_large_restrictive:1007, Large Restrictive Polyvinyl Chloride (PVC) Item Pipe +gregtech:item_pipe_large_restrictive:302, Large Restrictive Black Bronze Item Pipe +gregtech:item_pipe_large_restrictive:2014, Large Restrictive Cobalt Brass Item Pipe +gregtech:item_pipe_large_restrictive:75, Large Restrictive Osmium Item Pipe +gregtech:item_pipe_large_restrictive:69, Large Restrictive Nickel Item Pipe +gregtech:item_pipe_large_restrictive:112, Large Restrictive Tin Item Pipe gregtech:hermetic_casing:0, Hermetic Casing I gregtech:hermetic_casing:1, Hermetic Casing II gregtech:hermetic_casing:2, Hermetic Casing III @@ -11436,23 +11462,11 @@ gregtech:planks:1, Treated Wood Planks gregtech:rubber_log, Rubber Wood gregtech:rubber_leaves, Rubber Tree Leaves gregtech:rubber_sapling, Rubber Tree Sapling -gregtech:meta_block_compressed_0:2, Block of Aluminium -gregtech:meta_block_compressed_0:3, Block of Americium -gregtech:meta_block_compressed_0:4, Block of Antimony -gregtech:meta_block_compressed_0:9, Block of Berkelium -gregtech:meta_block_compressed_0:10, Block of Beryllium -gregtech:meta_block_compressed_0:11, Block of Bismuth -gregtech:meta_block_compressed_0:15, Block of Caesium -gregtech:meta_block_compressed_20:0, Block of Soldering Alloy -gregtech:meta_block_compressed_20:1, Block of Spessartine -gregtech:meta_block_compressed_20:3, Block of Stainless Steel -gregtech:meta_block_compressed_20:4, Block of Steel -gregtech:meta_block_compressed_20:8, Block of Tin Alloy -gregtech:meta_block_compressed_20:9, Block of Topaz -gregtech:meta_block_compressed_20:11, Block of Ultimet -gregtech:meta_block_compressed_20:13, Block of Uvarovite -gregtech:meta_block_compressed_20:14, Block of Vanadium-Gallium -gregtech:meta_block_compressed_20:15, Block of Wrought Iron +gregtech:meta_block_compressed_188:0, Block of Tantalum Carbide +gregtech:meta_block_compressed_188:1, Block of Molybdenum Disilicide +gregtech:meta_block_compressed_188:12, Block of HSLA Steel +gregtech:meta_block_compressed_188:13, Block of Titanium Tungsten Carbide +gregtech:meta_block_compressed_188:14, Block of Incoloy-MA956 gregtech:meta_block_compressed_2001:1, Block of Lumium gregtech:meta_block_compressed_2001:2, Block of Enderium gregtech:meta_block_compressed_2001:3, Block of material.electrum_flux @@ -11463,31 +11477,19 @@ gregtech:meta_block_compressed_2001:8, Block of material.soularium gregtech:meta_block_compressed_2001:9, Block of End Steel gregtech:meta_block_compressed_2001:10, Block of material.infinity gregtech:meta_block_compressed_2001:11, Block of Microversium -gregtech:meta_block_compressed_8:0, Block of Tritanium -gregtech:meta_block_compressed_8:1, Block of Duranium -gregtech:meta_block_compressed_8:2, Block of Trinium -gregtech:meta_block_compressed_188:0, Block of Tantalum Carbide -gregtech:meta_block_compressed_188:1, Block of Molybdenum Disilicide -gregtech:meta_block_compressed_188:12, Block of HSLA Steel -gregtech:meta_block_compressed_188:13, Block of Titanium Tungsten Carbide -gregtech:meta_block_compressed_188:14, Block of Incoloy-MA956 -gregtech:meta_block_compressed_21:2, Block of Yttrium Barium Cuprate -gregtech:meta_block_compressed_21:4, Block of Quartzite -gregtech:meta_block_compressed_21:5, Block of Graphite -gregtech:meta_block_compressed_21:6, Block of Graphene -gregtech:meta_block_compressed_21:8, Block of Osmiridium -gregtech:meta_block_compressed_21:15, Block of Gallium Arsenide -gregtech:meta_block_compressed_127:3, Block of Magnetic Steel -gregtech:meta_block_compressed_127:4, Block of Vanadiumsteel -gregtech:meta_block_compressed_127:5, Block of Potin -gregtech:meta_block_compressed_127:6, Block of Borosilicate Glass -gregtech:meta_block_compressed_127:10, Block of Naquadah Alloy +gregtech:meta_block_compressed_2001:12, Block of material.draconic_superconductor gregtech:meta_block_compressed_5:0, Block of Platinum gregtech:meta_block_compressed_5:1, Block of Plutonium 239 gregtech:meta_block_compressed_5:2, Block of Plutonium 241 gregtech:meta_block_compressed_5:10, Block of Rhodium gregtech:meta_block_compressed_5:13, Block of Ruthenium gregtech:meta_block_compressed_5:15, Block of Samarium +gregtech:meta_block_compressed_16:0, Block of Battery Alloy +gregtech:meta_block_compressed_16:1, Block of Blue Topaz +gregtech:meta_block_compressed_16:3, Block of Brass +gregtech:meta_block_compressed_16:4, Block of Bronze +gregtech:meta_block_compressed_16:10, Block of Charcoal +gregtech:meta_block_compressed_16:12, Block of Cinnabar gregtech:meta_block_compressed_7:0, Block of Tin gregtech:meta_block_compressed_7:1, Block of Titanium gregtech:meta_block_compressed_7:3, Block of Tungsten @@ -11500,12 +11502,42 @@ gregtech:meta_block_compressed_7:12, Block of Naquadah gregtech:meta_block_compressed_7:13, Block of Enriched Naquadah gregtech:meta_block_compressed_7:14, Block of Naquadria gregtech:meta_block_compressed_7:15, Block of Neutronium -gregtech:meta_block_compressed_17:2, Block of Cupronickel -gregtech:meta_block_compressed_17:5, Block of Electrum -gregtech:meta_block_compressed_17:9, Block of Green Sapphire -gregtech:meta_block_compressed_17:10, Block of Grossular -gregtech:meta_block_compressed_17:13, Block of Rutile -gregtech:meta_block_compressed_17:15, Block of Invar +gregtech:meta_block_compressed_21:2, Block of Yttrium Barium Cuprate +gregtech:meta_block_compressed_21:4, Block of Quartzite +gregtech:meta_block_compressed_21:6, Block of Graphene +gregtech:meta_block_compressed_21:8, Block of Osmiridium +gregtech:meta_block_compressed_21:15, Block of Gallium Arsenide +gregtech:meta_block_compressed_63:0, Block of Polyphenylene Sulfide +gregtech:meta_block_compressed_63:2, Block of Polybenzimidazole (PBI) +gregtech:meta_block_compressed_63:4, Block of Polyethylene (PE) +gregtech:meta_block_compressed_63:5, Block of Epoxy Resin +gregtech:meta_block_compressed_63:7, Block of Polycaprolactam +gregtech:meta_block_compressed_63:8, Block of Polytetrafluoroethylene (PTFE) +gregtech:meta_block_compressed_63:9, Block of Sugar +gregtech:meta_block_compressed_125:4, Block of Olivine +gregtech:meta_block_compressed_125:5, Block of Opal +gregtech:meta_block_compressed_125:6, Block of Amethyst +gregtech:meta_block_compressed_125:10, Block of Apatite +gregtech:meta_block_compressed_125:11, Block of Black Steel +gregtech:meta_block_compressed_125:12, Block of Damascus Steel +gregtech:meta_block_compressed_125:13, Block of Tungstensteel +gregtech:meta_block_compressed_125:14, Block of Cobalt Brass +gregtech:meta_block_compressed_126:0, Block of Red Garnet +gregtech:meta_block_compressed_126:1, Block of Yellow Garnet +gregtech:meta_block_compressed_126:13, Block of Monazite +gregtech:meta_block_compressed_8:0, Block of Tritanium +gregtech:meta_block_compressed_8:1, Block of Duranium +gregtech:meta_block_compressed_8:2, Block of Trinium +gregtech:meta_block_compressed_20:0, Block of Soldering Alloy +gregtech:meta_block_compressed_20:1, Block of Spessartine +gregtech:meta_block_compressed_20:3, Block of Stainless Steel +gregtech:meta_block_compressed_20:4, Block of Steel +gregtech:meta_block_compressed_20:8, Block of Tin Alloy +gregtech:meta_block_compressed_20:9, Block of Topaz +gregtech:meta_block_compressed_20:11, Block of Ultimet +gregtech:meta_block_compressed_20:13, Block of Uvarovite +gregtech:meta_block_compressed_20:14, Block of Vanadium-Gallium +gregtech:meta_block_compressed_20:15, Block of Wrought Iron gregtech:meta_block_compressed_1:1, Block of Californium gregtech:meta_block_compressed_1:6, Block of Chrome gregtech:meta_block_compressed_1:7, Block of Cobalt @@ -11513,18 +11545,17 @@ gregtech:meta_block_compressed_1:9, Block of Copper gregtech:meta_block_compressed_1:10, Block of Curium gregtech:meta_block_compressed_1:11, Block of Darmstadtium gregtech:meta_block_compressed_1:15, Block of Einsteinium -gregtech:meta_block_compressed_156:12, Block of Endereye -gregtech:meta_block_compressed_156:14, Block of Red Steel -gregtech:meta_block_compressed_156:15, Block of Blue Steel -gregtech:meta_block_compressed_16:0, Block of Battery Alloy -gregtech:meta_block_compressed_16:1, Block of Blue Topaz -gregtech:meta_block_compressed_16:3, Block of Brass -gregtech:meta_block_compressed_16:4, Block of Bronze -gregtech:meta_block_compressed_16:10, Block of Charcoal -gregtech:meta_block_compressed_16:12, Block of Cinnabar -gregtech:meta_block_compressed_24:1, Block of Malachite -gregtech:meta_block_compressed_24:11, Block of Magnetic Iron -gregtech:meta_block_compressed_24:12, Block of Tungstencarbide +gregtech:meta_block_compressed_26:0, Block of Enderpearl +gregtech:meta_block_compressed_26:2, Block of Magnetic Neodymium +gregtech:meta_block_compressed_26:7, Block of Magnetic Samarium +gregtech:meta_block_compressed_26:8, Block of Manganese Phosphide +gregtech:meta_block_compressed_26:9, Block of Magnesium Diboride +gregtech:meta_block_compressed_26:10, Block of Mercury Barium Calcium Cuprate +gregtech:meta_block_compressed_26:11, Block of Uranium Triplatinum +gregtech:meta_block_compressed_26:12, Block of Samarium Iron Arsenic Oxide +gregtech:meta_block_compressed_26:13, Block of Indium Tin Barium Titanium Cuprate +gregtech:meta_block_compressed_26:14, Block of Uranium Rhodium Dinaquadide +gregtech:meta_block_compressed_26:15, Block of Enriched Naquadah Trinium Europium Duranide gregtech:meta_block_compressed_2000:0, Block of material.fluix gregtech:meta_block_compressed_2000:1, Block of Draconium gregtech:meta_block_compressed_2000:2, Block of material.awakened_draconium @@ -11539,26 +11570,6 @@ gregtech:meta_block_compressed_2000:12, Block of Energetic Alloy gregtech:meta_block_compressed_2000:13, Block of Vibrant Alloy gregtech:meta_block_compressed_2000:14, Block of Pulsating Iron gregtech:meta_block_compressed_2000:15, Block of Electrical Steel -gregtech:meta_block_compressed_2:1, Block of Europium -gregtech:meta_block_compressed_2:7, Block of Gallium -gregtech:meta_block_compressed_6:3, Block of Silicon -gregtech:meta_block_compressed_6:4, Block of Silver -gregtech:meta_block_compressed_6:8, Block of Tantalum -gregtech:meta_block_compressed_6:13, Block of Thorium -gregtech:meta_block_compressed_26:0, Block of Enderpearl -gregtech:meta_block_compressed_26:2, Block of Magnetic Neodymium -gregtech:meta_block_compressed_26:7, Block of Magnetic Samarium -gregtech:meta_block_compressed_26:8, Block of Manganese Phosphide -gregtech:meta_block_compressed_26:9, Block of Magnesium Diboride -gregtech:meta_block_compressed_26:10, Block of Mercury Barium Calcium Cuprate -gregtech:meta_block_compressed_26:11, Block of Uranium Triplatinum -gregtech:meta_block_compressed_26:12, Block of Samarium Iron Arsenic Oxide -gregtech:meta_block_compressed_26:13, Block of Indium Tin Barium Titanium Cuprate -gregtech:meta_block_compressed_26:14, Block of Uranium Rhodium Dinaquadide -gregtech:meta_block_compressed_26:15, Block of Enriched Naquadah Trinium Europium Duranide -gregtech:meta_block_compressed_22:2, Block of Indium Gallium Phosphide -gregtech:meta_block_compressed_22:3, Block of Nickel Zinc Ferrite -gregtech:meta_block_compressed_22:13, Block of Realgar gregtech:meta_block_compressed_19:4, Block of Pyrope gregtech:meta_block_compressed_19:5, Block of Rock Salt gregtech:meta_block_compressed_19:6, Block of Ruridit @@ -11577,9 +11588,6 @@ gregtech:meta_block_compressed_18:12, Block of Sterling Silver gregtech:meta_block_compressed_18:13, Block of Rose Gold gregtech:meta_block_compressed_18:14, Block of Black Bronze gregtech:meta_block_compressed_18:15, Block of Bismuth Bronze -gregtech:meta_block_compressed_126:0, Block of Red Garnet -gregtech:meta_block_compressed_126:1, Block of Yellow Garnet -gregtech:meta_block_compressed_126:13, Block of Monazite gregtech:meta_block_compressed_187:8, Block of Stellite-100 gregtech:meta_block_compressed_187:9, Block of Watertight Steel gregtech:meta_block_compressed_187:10, Block of Maraging Steel 300 @@ -11588,23 +11596,19 @@ gregtech:meta_block_compressed_187:12, Block of Hastelloy-X gregtech:meta_block_compressed_187:13, Block of Trinaquadalloy gregtech:meta_block_compressed_187:14, Block of Zeron-100 gregtech:meta_block_compressed_187:15, Block of Titanium Carbide -gregtech:meta_block_compressed_157:4, Block of HSS-G -gregtech:meta_block_compressed_157:5, Block of Red Alloy -gregtech:meta_block_compressed_157:7, Block of HSS-E -gregtech:meta_block_compressed_157:8, Block of HSS-S -gregtech:meta_block_compressed_157:15, Block of Blue Alloy -gregtech:meta_block_compressed_125:4, Block of Olivine -gregtech:meta_block_compressed_125:5, Block of Opal -gregtech:meta_block_compressed_125:6, Block of Amethyst -gregtech:meta_block_compressed_125:10, Block of Apatite -gregtech:meta_block_compressed_125:11, Block of Black Steel -gregtech:meta_block_compressed_125:12, Block of Damascus Steel -gregtech:meta_block_compressed_125:13, Block of Tungstensteel -gregtech:meta_block_compressed_125:14, Block of Cobalt Brass -gregtech:meta_block_compressed_62:8, Block of Silicone Rubber -gregtech:meta_block_compressed_62:12, Block of Styrene-Butadiene Rubber -gregtech:meta_block_compressed_62:14, Block of Fiber-Reinforced Epoxy Resin -gregtech:meta_block_compressed_62:15, Block of Polyvinyl Chloride (PVC) +gregtech:meta_block_compressed_17:2, Block of Cupronickel +gregtech:meta_block_compressed_17:5, Block of Electrum +gregtech:meta_block_compressed_17:9, Block of Green Sapphire +gregtech:meta_block_compressed_17:10, Block of Grossular +gregtech:meta_block_compressed_17:13, Block of Rutile +gregtech:meta_block_compressed_17:15, Block of Invar +gregtech:meta_block_compressed_15:10, Block of Almandine +gregtech:meta_block_compressed_15:11, Block of Andradite +gregtech:meta_block_compressed_15:12, Block of Annealed Copper +gregtech:meta_block_compressed_13:6, Block of Certus Quartz +gregtech:meta_block_compressed_24:1, Block of Malachite +gregtech:meta_block_compressed_24:11, Block of Magnetic Iron +gregtech:meta_block_compressed_24:12, Block of Tungstencarbide gregtech:meta_block_compressed_4:0, Block of Molybdenum gregtech:meta_block_compressed_4:2, Block of Neodymium gregtech:meta_block_compressed_4:4, Block of Neptunium @@ -11612,55 +11616,77 @@ gregtech:meta_block_compressed_4:5, Block of Nickel gregtech:meta_block_compressed_4:7, Block of Niobium gregtech:meta_block_compressed_4:11, Block of Osmium gregtech:meta_block_compressed_4:13, Block of Palladium -gregtech:meta_block_compressed_15:10, Block of Almandine -gregtech:meta_block_compressed_15:11, Block of Andradite -gregtech:meta_block_compressed_15:12, Block of Annealed Copper -gregtech:meta_block_compressed_128:1, Block of Flint -gregtech:meta_block_compressed_128:14, Block of Rhodium Plated Palladium -gregtech:meta_block_compressed_13:6, Block of Certus Quartz +gregtech:meta_block_compressed_22:2, Block of Indium Gallium Phosphide +gregtech:meta_block_compressed_22:3, Block of Nickel Zinc Ferrite +gregtech:meta_block_compressed_22:13, Block of Realgar +gregtech:meta_block_compressed_157:4, Block of HSS-G +gregtech:meta_block_compressed_157:5, Block of Red Alloy +gregtech:meta_block_compressed_157:7, Block of HSS-E +gregtech:meta_block_compressed_157:8, Block of HSS-S +gregtech:meta_block_compressed_157:15, Block of Blue Alloy +gregtech:meta_block_compressed_62:8, Block of Silicone Rubber +gregtech:meta_block_compressed_62:12, Block of Styrene-Butadiene Rubber +gregtech:meta_block_compressed_62:14, Block of Fiber-Reinforced Epoxy Resin +gregtech:meta_block_compressed_62:15, Block of Polyvinyl Chloride (PVC) +gregtech:meta_block_compressed_156:12, Block of Endereye +gregtech:meta_block_compressed_156:14, Block of Red Steel +gregtech:meta_block_compressed_156:15, Block of Blue Steel gregtech:meta_block_compressed_3:0, Block of Indium gregtech:meta_block_compressed_3:2, Block of Iridium gregtech:meta_block_compressed_3:7, Block of Lead gregtech:meta_block_compressed_3:13, Block of Manganese -gregtech:meta_block_compressed_63:0, Block of Polyphenylene Sulfide -gregtech:meta_block_compressed_63:2, Block of Polybenzimidazole (PBI) -gregtech:meta_block_compressed_63:4, Block of Polyethylene (PE) -gregtech:meta_block_compressed_63:5, Block of Epoxy Resin -gregtech:meta_block_compressed_63:7, Block of Polycaprolactam -gregtech:meta_block_compressed_63:8, Block of Polytetrafluoroethylene (PTFE) -gregtech:meta_block_compressed_63:9, Block of Sugar -gregtech:meta_block_compressed_100:2, Block of Nether Star +gregtech:meta_block_compressed_2:1, Block of Europium +gregtech:meta_block_compressed_2:7, Block of Gallium gregtech:meta_block_compressed_27:0, Block of Ruthenium Trinium Americium Neutronate +gregtech:meta_block_compressed_6:3, Block of Silicon +gregtech:meta_block_compressed_6:4, Block of Silver +gregtech:meta_block_compressed_6:8, Block of Tantalum +gregtech:meta_block_compressed_6:13, Block of Thorium +gregtech:meta_block_compressed_0:2, Block of Aluminium +gregtech:meta_block_compressed_0:3, Block of Americium +gregtech:meta_block_compressed_0:4, Block of Antimony +gregtech:meta_block_compressed_0:9, Block of Berkelium +gregtech:meta_block_compressed_0:10, Block of Beryllium +gregtech:meta_block_compressed_0:11, Block of Bismuth +gregtech:meta_block_compressed_0:15, Block of Caesium +gregtech:meta_block_compressed_128:1, Block of Flint +gregtech:meta_block_compressed_128:14, Block of Rhodium Plated Palladium +gregtech:meta_block_compressed_127:3, Block of Magnetic Steel +gregtech:meta_block_compressed_127:4, Block of Vanadiumsteel +gregtech:meta_block_compressed_127:5, Block of Potin +gregtech:meta_block_compressed_127:6, Block of Borosilicate Glass +gregtech:meta_block_compressed_127:10, Block of Naquadah Alloy +gregtech:meta_block_compressed_100:2, Block of Nether Star gregtech:meta_block_compressed_66:12, Block of Rubber -gregtech:meta_block_frame_2001:11, Microversium Frame Box -gregtech:meta_block_frame_16:3, Brass Frame Box -gregtech:meta_block_frame_16:4, Bronze Frame Box -gregtech:meta_block_frame_20:3, Stainless Steel Frame Box -gregtech:meta_block_frame_20:4, Steel Frame Box -gregtech:meta_block_frame_24:12, Tungstencarbide Frame Box -gregtech:meta_block_frame_7:1, Titanium Frame Box -gregtech:meta_block_frame_7:3, Tungsten Frame Box -gregtech:meta_block_frame_7:15, Neutronium Frame Box -gregtech:meta_block_frame_8:0, Tritanium Frame Box -gregtech:meta_block_frame_101:1, Wood Frame Box -gregtech:meta_block_frame_103:0, Treated Wood Frame Box -gregtech:meta_block_frame_0:2, Aluminium Frame Box -gregtech:meta_block_frame_188:12, HSLA Steel Frame Box -gregtech:meta_block_frame_188:14, Incoloy-MA956 Frame Box -gregtech:meta_block_frame_127:10, Naquadah Alloy Frame Box -gregtech:meta_block_frame_17:15, Invar Frame Box -gregtech:meta_block_frame_157:4, HSS-G Frame Box -gregtech:meta_block_frame_157:7, HSS-E Frame Box -gregtech:meta_block_frame_157:8, HSS-S Frame Box -gregtech:meta_block_frame_63:8, Polytetrafluoroethylene (PTFE) Frame Box -gregtech:meta_block_frame_156:15, Blue Steel Frame Box gregtech:meta_block_frame_187:9, Watertight Steel Frame Box gregtech:meta_block_frame_187:10, Maraging Steel 300 Frame Box gregtech:meta_block_frame_187:11, Hastelloy-C276 Frame Box gregtech:meta_block_frame_187:12, Hastelloy-X Frame Box -gregtech:meta_block_frame_2:1, Europium Frame Box +gregtech:meta_block_frame_188:12, HSLA Steel Frame Box +gregtech:meta_block_frame_188:14, Incoloy-MA956 Frame Box +gregtech:meta_block_frame_24:12, Tungstencarbide Frame Box +gregtech:meta_block_frame_157:4, HSS-G Frame Box +gregtech:meta_block_frame_157:7, HSS-E Frame Box +gregtech:meta_block_frame_157:8, HSS-S Frame Box gregtech:meta_block_frame_125:13, Tungstensteel Frame Box gregtech:meta_block_frame_2000:3, Dark Steel Frame Box +gregtech:meta_block_frame_20:3, Stainless Steel Frame Box +gregtech:meta_block_frame_20:4, Steel Frame Box +gregtech:meta_block_frame_63:8, Polytetrafluoroethylene (PTFE) Frame Box +gregtech:meta_block_frame_127:10, Naquadah Alloy Frame Box +gregtech:meta_block_frame_7:1, Titanium Frame Box +gregtech:meta_block_frame_7:3, Tungsten Frame Box +gregtech:meta_block_frame_7:15, Neutronium Frame Box +gregtech:meta_block_frame_2:1, Europium Frame Box +gregtech:meta_block_frame_101:1, Wood Frame Box +gregtech:meta_block_frame_8:0, Tritanium Frame Box +gregtech:meta_block_frame_0:2, Aluminium Frame Box +gregtech:meta_block_frame_16:3, Brass Frame Box +gregtech:meta_block_frame_16:4, Bronze Frame Box +gregtech:meta_block_frame_103:0, Treated Wood Frame Box +gregtech:meta_block_frame_156:15, Blue Steel Frame Box +gregtech:meta_block_frame_2001:11, Microversium Frame Box +gregtech:meta_block_frame_17:15, Invar Frame Box gcym:unique_casing:0, Crushing Wheels gcym:unique_casing:1, Slicing Blades gcym:unique_casing:2, Electrolytic Cell @@ -11786,6 +11812,8 @@ storagedrawers:customdrawers:2, Framed Drawers 2x2 storagedrawers:customdrawers:3, Framed Half Drawers 1x2 storagedrawers:customdrawers:4, Framed Half Drawers 2x2 storagedrawers:customtrim, Framed Trim +supersoundmuffler:sound_muffler_bauble, Super Sound Muffler +supersoundmuffler:sound_muffler, Super Sound Muffler torchmaster:frozen_pearl, Frozen Pearl torchmaster:mega_torch:0, Mega Torch torchmaster:mega_torch:1, Unlit Mega Torch @@ -12395,6 +12423,38 @@ densemetals:dense_tantalum_ore, Dense Tantalum Ore densemetals:dense_tungsten_ore, Dense Tungsten Ore densemetals:dense_uranium_ore, Dense Uranium Ore densemetals:dense_zirconium_ore, Dense Zirconium Ore +actuallyadditions:magnet_ring_bauble:0, Ring of Magnetizing +actuallyadditions:magnet_ring_bauble:0, Ring of Magnetizing +actuallyadditions:potion_ring_advanced_bauble:0, Advanced Ring of Speed +actuallyadditions:potion_ring_advanced_bauble:0, Advanced Ring of Speed +actuallyadditions:potion_ring_advanced_bauble:1, Advanced Ring of Haste +actuallyadditions:potion_ring_advanced_bauble:1, Advanced Ring of Haste +actuallyadditions:potion_ring_advanced_bauble:2, Advanced Ring of Strength +actuallyadditions:potion_ring_advanced_bauble:2, Advanced Ring of Strength +actuallyadditions:potion_ring_advanced_bauble:3, Advanced Ring of Jump Boost +actuallyadditions:potion_ring_advanced_bauble:3, Advanced Ring of Jump Boost +actuallyadditions:potion_ring_advanced_bauble:4, Advanced Ring of Regeneration +actuallyadditions:potion_ring_advanced_bauble:4, Advanced Ring of Regeneration +actuallyadditions:potion_ring_advanced_bauble:5, Advanced Ring of Resistance +actuallyadditions:potion_ring_advanced_bauble:5, Advanced Ring of Resistance +actuallyadditions:potion_ring_advanced_bauble:6, Advanced Ring of Fire Resistance +actuallyadditions:potion_ring_advanced_bauble:6, Advanced Ring of Fire Resistance +actuallyadditions:potion_ring_advanced_bauble:7, Advanced Ring of Water Breathing +actuallyadditions:potion_ring_advanced_bauble:7, Advanced Ring of Water Breathing +actuallyadditions:potion_ring_advanced_bauble:8, Advanced Ring of Invisibility +actuallyadditions:potion_ring_advanced_bauble:8, Advanced Ring of Invisibility +actuallyadditions:potion_ring_advanced_bauble:9, Advanced Ring of Night Vision +actuallyadditions:potion_ring_advanced_bauble:9, Advanced Ring of Night Vision +actuallyadditions:battery_bauble:0, Single Battery +actuallyadditions:battery_bauble:0, Single Battery +actuallyadditions:battery_double_bauble:0, Double Battery +actuallyadditions:battery_double_bauble:0, Double Battery +actuallyadditions:battery_triple_bauble:0, Triple Battery +actuallyadditions:battery_triple_bauble:0, Triple Battery +actuallyadditions:battery_quadruple_bauble:0, Quadruple Battery +actuallyadditions:battery_quadruple_bauble:0, Quadruple Battery +actuallyadditions:battery_quintuple_bauble:0, Quintuple Battery +actuallyadditions:battery_quintuple_bauble:0, Quintuple Battery actuallyadditions:block_canola_oil, Canola Oil actuallyadditions:block_refined_canola_oil, Refined Canola Oil actuallyadditions:block_crystal_oil, Crystallized Oil diff --git a/config/InvTweaks.cfg b/config/InvTweaks.cfg index fbb6317..f73eeb9 100644 --- a/config/InvTweaks.cfg +++ b/config/InvTweaks.cfg @@ -1,6 +1,6 @@ #Inventory Tweaks Configuration #(Regarding shortcuts, all key names can be found at: http://legacy.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html) -#Sun Jun 30 14:35:26 EDT 2019 +#Mon Jan 24 23:31:06 SGT 2022 enableMiddleClick=true showChestButtons=true enableSortingOnPickup=false diff --git a/config/JustEnoughCalculation/record.json b/config/JustEnoughCalculation/record.json index 589606d..7d596b6 100644 --- a/config/JustEnoughCalculation/record.json +++ b/config/JustEnoughCalculation/record.json @@ -1,17 +1,17 @@ { "craft": { - "inventory": 0b, "amount": "", - "recents": [] - }, - "player": { - "last": "", - "recipes": {} + "recents": [], + "inventory": 0b }, "math": { "current": "", "last": "0", - "operator": 0, - "state": 0 + "state": 0, + "operator": 0 + }, + "player": { + "recipes": {}, + "last": "" } } diff --git a/config/brandon3055/CustomFusionRecipes.json b/config/brandon3055/CustomFusionRecipes.json index 46c24b6..26bcb0d 100644 --- a/config/brandon3055/CustomFusionRecipes.json +++ b/config/brandon3055/CustomFusionRecipes.json @@ -47,12 +47,12 @@ "ingredients": [ "draconicevolution:chaotic_core", "draconicevolution:chaotic_core", - "gregtech:wire_single,1,432", - "gregtech:wire_single,1,432", + "gregtech:wire_single,1,32028", + "gregtech:wire_single,1,32028", "extendedcrafting:storage,1,4", "extendedcrafting:storage,1,4", - "gregtech:wire_single,1,432", - "gregtech:wire_single,1,432", + "gregtech:wire_single,1,32028", + "gregtech:wire_single,1,32028", "draconicevolution:chaotic_core", "draconicevolution:chaotic_core" ] @@ -87,8 +87,8 @@ "solarflux:solar_panel_8", "enderio:item_endergy_conduit,1,10", "enderio:item_endergy_conduit,1,10", - "draconicevolution:draconium_block", - "draconicevolution:draconium_block", + "gregtech:meta_block_compressed_2000,1,1", + "gregtech:meta_block_compressed_2000,1,1", "enderio:item_endergy_conduit,1,10", "enderio:item_endergy_conduit,1,10", "solarflux:solar_panel_8", @@ -107,16 +107,16 @@ "energy": 2600000000, "tier": 2, "ingredients": [ - "draconicevolution:draconic_block", - "draconicevolution:draconic_block", + "gregtech:meta_block_compressed_2000,1,2", + "gregtech:meta_block_compressed_2000,1,2", "draconicevolution:chaos_shard", "draconicevolution:chaos_shard", "contenttweaker:stabilizedeinsteinium", "contenttweaker:stabilizedeinsteinium", "draconicevolution:chaos_shard", "draconicevolution:chaos_shard", - "draconicevolution:draconic_block", - "draconicevolution:draconic_block" + "gregtech:meta_block_compressed_2000,1,2", + "gregtech:meta_block_compressed_2000,1,2" ] }, { @@ -221,8 +221,8 @@ "ingredients": [ "extrautils2:compressedcobblestone,1,3", "enderio:block_alloy,1,6", - "draconicevolution:draconium_dust", - "draconicevolution:draconium_dust", + "gregtech:meta_dust,1,32001", + "gregtech:meta_dust,1,32001", "thermalfoundation:material,1,1024", "thermalfoundation:material,1,1024", "armorplus:compressed_obsidian", @@ -243,27 +243,27 @@ "energy": 41943000, "tier": 2, "ingredients": [ - "draconicevolution:draconic_ingot", - "draconicevolution:draconic_ingot", + "gregtech:meta_ingot,1,32002", + "gregtech:meta_ingot,1,32002", "draconicevolution:awakened_core", "draconicevolution:awakened_core", - "ore:compressedoctadiccap", - "ore:compressedoctadiccap", + "gregtech:meta_item_1,1,750", + "gregtech:meta_item_1,1,750", "actuallyadditions:block_crystal_empowered", "actuallyadditions:block_crystal_empowered", - "draconicevolution:draconic_ingot", - "draconicevolution:draconic_ingot" + "gregtech:meta_ingot,1,32002", + "gregtech:meta_ingot,1,32002" ] }, { "mode": "REMOVE", - "result": "draconicevolution:draconic_block", - "catalyst": "draconicevolution:draconium_block" + "result": "gregtech:meta_block_compressed_2000,1,2", + "catalyst": "gregtech:meta_block_compressed_2000,1,1" }, { "mode": "ADD", - "result": "draconicevolution:draconic_block,5,0", - "catalyst": "draconicevolution:draconium_block,5,0", + "result": "gregtech:meta_block_compressed_2000,5,2", + "catalyst": "gregtech:meta_block_compressed_2000,5,1", "energy": 4000000000, "tier": 1, "ingredients": [ @@ -289,8 +289,8 @@ "ingredients": [ "draconicevolution:wyvern_core", "draconicevolution:wyvern_core", - "draconicevolution:draconic_block", - "draconicevolution:draconic_block", + "gregtech:meta_block_compressed_2000,1,2", + "gregtech:meta_block_compressed_2000,1,2", "draconicevolution:wyvern_core", "draconicevolution:wyvern_core" ] diff --git a/config/gregtech.cfg b/config/gregtech.cfg index 3ae9555..51239ad 100644 --- a/config/gregtech.cfg +++ b/config/gregtech.cfg @@ -384,7 +384,7 @@ general { B:hardDyeRecipes=false # Whether to make Glass related recipes harder. Default: true - B:hardGlassRecipes=true + B:hardGlassRecipes=false # Recipes for items like Iron Doors, Trapdoors, Buckets, Cauldrons, Hoppers, and Iron Bars require Iron Plates, Rods, and more. # Default: true @@ -414,7 +414,7 @@ general { # Whether to remove charcoal smelting recipes from the vanilla furnace. # Default: true - B:harderCharcoalRecipe=true + B:harderCharcoalRecipe=false # Whether to make the recipe for the EBF Controller harder. # Default: false diff --git a/config/jei/worldSettings.cfg b/config/jei/worldSettings.cfg index 6455df6..4b60a3f 100644 --- a/config/jei/worldSettings.cfg +++ b/config/jei/worldSettings.cfg @@ -25,7 +25,7 @@ world1855637915 { # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false - S:filterText=loot fa + S:filterText=termina # Show the list of ingredients next to open GUIs. B:overlayEnabled=true diff --git a/config/phosphor.json b/config/phosphor.json index 62ee39e..3af625c 100644 --- a/config/phosphor.json +++ b/config/phosphor.json @@ -1,4 +1,5 @@ { "enable_illegal_thread_access_warnings": true, - "enable_phosphor": true + "enable_phosphor": true, + "show_patreon_message": false } \ No newline at end of file diff --git a/config/splash.properties b/config/splash.properties index 392183a..26b9461 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sun Jan 23 23:48:44 SGT 2022 +#Mon Jan 24 23:30:02 SGT 2022 background=0x837793 memoryGood=0x78CB34 font=0x0 diff --git a/manifest.json b/manifest.json index cdfdce9..973c3ba 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"minecraft":{"version":"1.12.2","modLoaders":[{"id":"forge-14.23.5.2860","primary":true}]},"manifestType":"minecraftModpack","overrides":"overrides","manifestVersion":1,"version":"0.1.1","author":"__tracer","name":"nomi-ceu","files":[{"projectID":60089,"fileID":2671937,"required":true},{"projectID":248787,"fileID":2987247,"required":true},{"projectID":250363,"fileID":2746011,"required":true},{"projectID":256717,"fileID":2666198,"required":true},{"projectID":306770,"fileID":3162874,"required":true},{"projectID":32274,"fileID":2916002,"required":true},{"projectID":223852,"fileID":2952606,"required":true},{"projectID":267602,"fileID":2915363,"required":true},{"projectID":230497,"fileID":2450900,"required":true},{"projectID":240630,"fileID":2728585,"required":true},{"projectID":239197,"fileID":3587830,"required":true},{"projectID":242818,"fileID":2779848,"required":true},{"projectID":250419,"fileID":2689502,"required":true},{"projectID":238222,"fileID":3043174,"required":true},{"projectID":235279,"fileID":2915375,"required":true},{"projectID":288885,"fileID":2838777,"required":true},{"projectID":283644,"fileID":2694382,"required":true},{"projectID":237065,"fileID":3331364,"required":true},{"projectID":246996,"fileID":3440963,"required":true},{"projectID":398267,"fileID":3613140,"required":true},{"projectID":272335,"fileID":2645867,"required":true},{"projectID":245211,"fileID":2667280,"required":true},{"projectID":564858,"fileID":3612876,"required":true},{"projectID":292785,"fileID":2915154,"required":true},{"projectID":278494,"fileID":3327893,"required":true},{"projectID":278799,"fileID":2833002,"required":true},{"projectID":228404,"fileID":3117927,"required":true},{"projectID":225561,"fileID":2678374,"required":true},{"projectID":245174,"fileID":2755787,"required":true},{"projectID":391401,"fileID":3613142,"required":true},{"projectID":225194,"fileID":2491032,"required":true},{"projectID":70496,"fileID":2518031,"required":true},{"projectID":244559,"fileID":2830252,"required":true},{"projectID":255232,"fileID":2830265,"required":true},{"projectID":304024,"fileID":2830114,"required":true},{"projectID":570458,"fileID":3616360,"required":true},{"projectID":223565,"fileID":3431261,"required":true},{"projectID":270789,"fileID":2920436,"required":true},{"projectID":231382,"fileID":3408276,"required":true},{"projectID":236542,"fileID":3015079,"required":true},{"projectID":236541,"fileID":3611363,"required":true},{"projectID":237366,"fileID":2952741,"required":true},{"projectID":248055,"fileID":2580332,"required":true},{"projectID":222880,"fileID":2926428,"required":true},{"projectID":271384,"fileID":2920434,"required":true},{"projectID":69162,"fileID":2920433,"required":true},{"projectID":284229,"fileID":2968355,"required":true},{"projectID":69163,"fileID":2926431,"required":true},{"projectID":64578,"fileID":3328811,"required":true},{"projectID":231868,"fileID":2972849,"required":true},{"projectID":308380,"fileID":3614585,"required":true},{"projectID":322861,"fileID":3214400,"required":true},{"projectID":297209,"fileID":2607310,"required":true},{"projectID":252910,"fileID":3041340,"required":true},{"projectID":227083,"fileID":2518667,"required":true},{"projectID":248453,"fileID":2785465,"required":true},{"projectID":226254,"fileID":3328174,"required":true},{"projectID":251792,"fileID":3294422,"required":true},{"projectID":266736,"fileID":2668113,"required":true},{"projectID":304920,"fileID":2669468,"required":true},{"projectID":70631,"fileID":2939416,"required":true},{"projectID":269024,"fileID":2861574,"required":true},{"projectID":314904,"fileID":2819669,"required":true},{"projectID":237102,"fileID":3157548,"required":true},{"projectID":237167,"fileID":2985811,"required":true},{"projectID":220954,"fileID":3488553,"required":true},{"projectID":253211,"fileID":3308160,"required":true},{"projectID":238747,"fileID":2739582,"required":true},{"projectID":242106,"fileID":2539562,"required":true},{"projectID":261348,"fileID":3143349,"required":true},{"projectID":271835,"fileID":2920437,"required":true},{"projectID":313141,"fileID":2675884,"required":true},{"projectID":246974,"fileID":3050838,"required":true},{"projectID":304346,"fileID":3328808,"required":true},{"projectID":279172,"fileID":2491542,"required":true},{"projectID":241344,"fileID":2480458,"required":true},{"projectID":291737,"fileID":2920441,"required":true},{"projectID":252354,"fileID":2464501,"required":true},{"projectID":243146,"fileID":2540650,"required":true},{"projectID":257573,"fileID":3248033,"required":true},{"projectID":557242,"fileID":3614219,"required":true},{"projectID":302113,"fileID":2847346,"required":true},{"projectID":250832,"fileID":2845365,"required":true},{"projectID":242223,"fileID":3524685,"required":true},{"projectID":254317,"fileID":2932048,"required":true},{"projectID":254268,"fileID":3529742,"required":true},{"projectID":386188,"fileID":3617282,"required":true},{"projectID":238857,"fileID":2863771,"required":true},{"projectID":423758,"fileID":3564705,"required":true},{"projectID":238856,"fileID":2950248,"required":true}]} +{"minecraft":{"version":"1.12.2","modLoaders":[{"id":"forge-14.23.5.2860","primary":true}]},"manifestType":"minecraftModpack","overrides":"overrides","manifestVersion":1,"version":"0.2","author":"__tracer","name":"nomi-ceu","files":[{"projectID":60089,"fileID":2671937,"required":true},{"projectID":248787,"fileID":2987247,"required":true},{"projectID":250363,"fileID":2746011,"required":true},{"projectID":256717,"fileID":2666198,"required":true},{"projectID":306770,"fileID":3162874,"required":true},{"projectID":32274,"fileID":2916002,"required":true},{"projectID":223852,"fileID":2952606,"required":true},{"projectID":267602,"fileID":2915363,"required":true},{"projectID":230497,"fileID":2450900,"required":true},{"projectID":240630,"fileID":2728585,"required":true},{"projectID":239197,"fileID":3587830,"required":true},{"projectID":242818,"fileID":2779848,"required":true},{"projectID":250419,"fileID":2689502,"required":true},{"projectID":238222,"fileID":3043174,"required":true},{"projectID":235279,"fileID":2915375,"required":true},{"projectID":288885,"fileID":2838777,"required":true},{"projectID":283644,"fileID":2694382,"required":true},{"projectID":237065,"fileID":3331364,"required":true},{"projectID":246996,"fileID":3440963,"required":true},{"projectID":398267,"fileID":3613140,"required":true},{"projectID":272335,"fileID":2645867,"required":true},{"projectID":245211,"fileID":2667280,"required":true},{"projectID":564858,"fileID":3612876,"required":true},{"projectID":292785,"fileID":2915154,"required":true},{"projectID":278494,"fileID":3327893,"required":true},{"projectID":278799,"fileID":2833002,"required":true},{"projectID":228404,"fileID":3117927,"required":true},{"projectID":225561,"fileID":2678374,"required":true},{"projectID":245174,"fileID":2755787,"required":true},{"projectID":391401,"fileID":3613142,"required":true},{"projectID":225194,"fileID":2491032,"required":true},{"projectID":70496,"fileID":2518031,"required":true},{"projectID":244559,"fileID":2830252,"required":true},{"projectID":255232,"fileID":2830265,"required":true},{"projectID":304024,"fileID":2830114,"required":true},{"projectID":570458,"fileID":3616360,"required":true},{"projectID":223565,"fileID":3431261,"required":true},{"projectID":270789,"fileID":2920436,"required":true},{"projectID":231382,"fileID":3408276,"required":true},{"projectID":236542,"fileID":3015079,"required":true},{"projectID":236541,"fileID":3611363,"required":true},{"projectID":237366,"fileID":2952741,"required":true},{"projectID":248055,"fileID":2580332,"required":true},{"projectID":222880,"fileID":2926428,"required":true},{"projectID":271384,"fileID":2920434,"required":true},{"projectID":69162,"fileID":2920433,"required":true},{"projectID":284229,"fileID":2968355,"required":true},{"projectID":69163,"fileID":2926431,"required":true},{"projectID":64578,"fileID":3328811,"required":true},{"projectID":231868,"fileID":2972849,"required":true},{"projectID":308380,"fileID":3614585,"required":true},{"projectID":322861,"fileID":3214400,"required":true},{"projectID":297209,"fileID":2607310,"required":true},{"projectID":252910,"fileID":3041340,"required":true},{"projectID":227083,"fileID":2518667,"required":true},{"projectID":248453,"fileID":2785465,"required":true},{"projectID":226254,"fileID":3328174,"required":true},{"projectID":251792,"fileID":3294422,"required":true},{"projectID":266736,"fileID":2668113,"required":true},{"projectID":304920,"fileID":2669468,"required":true},{"projectID":70631,"fileID":2939416,"required":true},{"projectID":269024,"fileID":2861574,"required":true},{"projectID":314904,"fileID":2819669,"required":true},{"projectID":237102,"fileID":3157548,"required":true},{"projectID":237167,"fileID":2985811,"required":true},{"projectID":220954,"fileID":3488553,"required":true},{"projectID":253211,"fileID":3308160,"required":true},{"projectID":238747,"fileID":2739582,"required":true},{"projectID":242106,"fileID":2539562,"required":true},{"projectID":261348,"fileID":3143349,"required":true},{"projectID":271835,"fileID":2920437,"required":true},{"projectID":313141,"fileID":2675884,"required":true},{"projectID":246974,"fileID":3050838,"required":true},{"projectID":304346,"fileID":3328808,"required":true},{"projectID":279172,"fileID":2491542,"required":true},{"projectID":241344,"fileID":2480458,"required":true},{"projectID":291737,"fileID":2920441,"required":true},{"projectID":252354,"fileID":2464501,"required":true},{"projectID":243146,"fileID":2540650,"required":true},{"projectID":257573,"fileID":3248033,"required":true},{"projectID":557242,"fileID":3614219,"required":true},{"projectID":302113,"fileID":2847346,"required":true},{"projectID":250832,"fileID":2845365,"required":true},{"projectID":242223,"fileID":3524685,"required":true},{"projectID":254317,"fileID":2932048,"required":true},{"projectID":254268,"fileID":3529742,"required":true},{"projectID":386188,"fileID":3617282,"required":true},{"projectID":238857,"fileID":2863771,"required":true},{"projectID":423758,"fileID":3564705,"required":true},{"projectID":238856,"fileID":2950248,"required":true},{"projectID":273430,"fileID":2459131,"required":true},{"projectID":298187,"fileID":3005950,"required":true},{"projectID":250398,"fileID":3025548,"required":true},{"projectID":251407,"fileID":2624712,"required":true},{"projectID":233071,"fileID":2562139,"required":true},{"projectID":223094,"fileID":2482481,"required":true},{"projectID":230976,"fileID":2463272,"required":true},{"projectID":258881,"fileID":2512758,"required":true},{"projectID":243478,"fileID":2745657,"required":true},{"projectID":318255,"fileID":2747710,"required":true},{"projectID":361579,"fileID":3542217,"required":true},{"projectID":363856,"fileID":2886150,"required":true},{"projectID":282313,"fileID":2689835,"required":true},{"projectID":271740,"fileID":2707353,"required":true},{"projectID":247111,"fileID":2887479,"required":true}]} diff --git a/modlist.html b/modlist.html index 61111cb..2695c69 100644 --- a/modlist.html +++ b/modlist.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/contenttweaker/lang/en_us.lang b/resources/contenttweaker/lang/en_us.lang index dd1804a..f605987 100644 --- a/resources/contenttweaker/lang/en_us.lang +++ b/resources/contenttweaker/lang/en_us.lang @@ -13,6 +13,15 @@ material.manyullyn=Manyullyn material.omnium=Omnium material.draconium=Draconium material.microversium=Microversium +material.awakened_draconium=Awakened Draconium +material.electrum_flux=Fluxed Electrum +material.mithril=Mana Infused +material.knightslime=Knightslime +material.crystal_matrix=Crystal Matrix +material.soularium=Soularium +material.infinity=Infinity +material.draconic_superconductor=Draconic Superconductor +material.fluix=Fluix item.contenttweaker.omnicoin.name=Omnipenny [1] item.contenttweaker.omnicoin5.name=Omninickel [5] @@ -252,4 +261,5 @@ recipemap.creative_tank_provider.name=Creative Tank Provider recipemap.naquadah_reactor_1.name=Naquadah Reactor 1 recipemap.naquadah_reactor_2.name=Naquadah Reactor 2 recipemap.large_lapidary_dynamo.name=Large Lapidary Dynamo -recipemap.lunar_mining_station=Lunar Mining \ No newline at end of file +recipemap.lunar_mining_station=Lunar Mining + diff --git a/scripts/Armors.zs b/scripts/Armors.zs index e455cca..0f140dc 100644 --- a/scripts/Armors.zs +++ b/scripts/Armors.zs @@ -497,7 +497,7 @@ mods.avaritia.ExtremeCrafting.remove(); mods.extendedcrafting.TableCrafting.addShaped(, [ [null,null,,,,,,null,null], [null,,,,,,,,null], -[null,,,,,,,,null], +[null,,,,,,,,null], [null,,,,,,,,null], [null,,,,,,,,null], [null,null,null,,null,,null,null,null], @@ -555,9 +555,9 @@ mods.extendedcrafting.TableCrafting.addShaped(, [ [,,,null,null,null,,,], [,,,,null,,,,], [null,,,,,,,,null], -[null,,,,,,,,null], -[null,,,,,,,,null], -[null,,,,,,,,null], +[null,,,,,,,,null], +[null,,,,,,,,null], +[null,,,,,,,,null], [null,,,,,,,,null], [null,null,,,,,,null,null]]); @@ -608,7 +608,7 @@ mods.extendedcrafting.TableCrafting.addShaped(, [ [,,,,,,,,], [,,,null,null,null,,,], [,,,null,null,null,,,], -[,,,null,null,null,,,], +[,,,null,null,null,,,], [,,,null,null,null,,,], [,,,null,null,null,,,], [,,,null,null,null,,,]]); @@ -664,7 +664,7 @@ mods.extendedcrafting.TableCrafting.addShaped(, [ [null,,,,null,,,,null], [,,,,null,,,,], [,,,,null,,,,], -[,,,,null,,,,], +[,,,,null,,,,], [null,null,null,null,null,null,null,null,null], [null,null,null,null,null,null,null,null,null], [null,null,null,null,null,null,null,null,null]]); diff --git a/scripts/BlastFurnace.zs b/scripts/BlastFurnace.zs index fc1ed79..5d13f2e 100644 --- a/scripts/BlastFurnace.zs +++ b/scripts/BlastFurnace.zs @@ -12,9 +12,9 @@ furnace.remove(); furnace.remove(); furnace.remove(); furnace.remove(); -furnace.remove(, ); -furnace.remove(, ); -furnace.remove(, ); +furnace.remove(, ); +furnace.remove(, ); +furnace.remove(, ); // Tier 0 Steel, Silicon // Tier 1 [1000 temp] 120 Copper Black Steel, Annealed Copper @@ -200,7 +200,7 @@ blast_furnace.recipeBuilder().inputs([]).fluidInputs([.findRecipe(120, [], null).remove(); vacuum_freezer.recipeBuilder() .inputs() - .outputs() + .outputs() .duration(195) .EUt(120) .buildAndRegister(); @@ -223,7 +223,7 @@ recipes.addShapeless( * 4, [ .findRecipe(120, [], null).remove(); vacuum_freezer.recipeBuilder() .inputs() - .outputs() + .outputs() .duration(270) .EUt(120) .buildAndRegister(); @@ -264,12 +264,12 @@ blast_furnace.recipeBuilder().inputs([]).fluidIn .findRecipe(120, [], null).remove(); vacuum_freezer.recipeBuilder() .inputs() - .outputs() + .outputs() .duration(555) .EUt(120) .buildAndRegister(); //Draconium [tier 14] -blast_furnace.recipeBuilder().inputs([]).fluidInputs([*2000]).outputs().property("temperature", 6800).duration(10000).EUt(120).buildAndRegister(); +blast_furnace.recipeBuilder().inputs([]).fluidInputs([*2000]).outputs().property("temperature", 6800).duration(10000).EUt(120).buildAndRegister(); blast_furnace.recipeBuilder().inputs([ * 4]).fluidInputs([*8000]).outputs([ * 2]).property("temperature", 6800).duration(20000).EUt(120).buildAndRegister(); //Naquadah Alloy [tier 15] DISABLED IN FAVOR OF VANILLA RECIPE @@ -299,13 +299,13 @@ blast_furnace.recipeBuilder().inputs([]).outputs([,]).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(); +alloy_smelter.recipeBuilder().inputs([,]).outputs([]).duration(150).EUt(16).buildAndRegister(); //Removed //blast_furnace.findRecipe(120, [], [null]).remove(); //Naquadriah -furnace.addRecipe(, , 0.0); +//furnace.addRecipe(, , 0.0); diff --git a/scripts/DraconicEvolution.zs b/scripts/DraconicEvolution.zs index 7fe523e..f17bfce 100644 --- a/scripts/DraconicEvolution.zs +++ b/scripts/DraconicEvolution.zs @@ -98,45 +98,45 @@ recipes.addShaped(, [ [, , ], [, , ]]); - //Draconium -mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); -//GTCE Nugget Recipe -solidifier.findRecipe(7, [], [ * 144]).remove(); -//GTCE ingot recipe -solidifier.findRecipe(7, [], [ * 144]).remove(); -//GTCE Block recipe -solidifier.findRecipe(7, [], [ * 1296]).remove(); - -//Nugget Recipe -solidifier.recipeBuilder() - .fluidInputs( * 144) - .notConsumable() - .outputs([ * 9]) - .duration(200).EUt(30).buildAndRegister(); - -//Ingot Recipe -solidifier.recipeBuilder() - .fluidInputs( * 144) - .notConsumable() - .outputs([]) - .duration(200).EUt(30).buildAndRegister(); - -//Block Recipe -solidifier.recipeBuilder() - .fluidInputs( * 1296) - .notConsumable() - .outputs([]) - .duration(200).EUt(30).buildAndRegister(); - -recipes.addShapeless(, [,,,]); - -recipes.addShapeless(, [,,,,,,,,]); -furnace.remove(); -//GTCE Draconium ingot from dust -furnace.remove(); +// //Draconium +//mods.jei.JEI.removeAndHide(); +//mods.jei.JEI.removeAndHide(); +//mods.jei.JEI.removeAndHide(); +//mods.jei.JEI.removeAndHide(); +////GTCE Nugget Recipe +//solidifier.findRecipe(7, [], [ * 144]).remove(); +////GTCE ingot recipe +//solidifier.findRecipe(7, [], [ * 144]).remove(); +////GTCE Block recipe +//solidifier.findRecipe(7, [], [ * 1296]).remove(); +// +////Nugget Recipe +//solidifier.recipeBuilder() +// .fluidInputs( * 144) +// .notConsumable() +// .outputs([ * 9]) +// .duration(200).EUt(30).buildAndRegister(); +// +////Ingot Recipe +//solidifier.recipeBuilder() +// .fluidInputs( * 144) +// .notConsumable() +// .outputs([]) +// .duration(200).EUt(30).buildAndRegister(); +// +////Block Recipe +//solidifier.recipeBuilder() +// .fluidInputs( * 1296) +// .notConsumable() +// .outputs([]) +// .duration(200).EUt(30).buildAndRegister(); +// +//recipes.addShapeless(, [,,,]); +// +//recipes.addShapeless(, [,,,,,,,,]); +//furnace.remove(); +////GTCE Draconium ingot from dust +//furnace.remove(); //GTCE tiny pile -> GTCE dust //packager.findRecipe(12, [ * 9, .withTag({Configuration: 1, not_consumed: 1 as byte})], [null]).remove(); @@ -148,28 +148,28 @@ furnace.remove(); //packager.findRecipe(12, [ * 9, .withTag({Configuration: 1, not_consumed: 1 as byte})], [null]).remove(); //macerator.findRecipe(2, [], [null]).remove(); -macerator.recipeBuilder() - .inputs() - .outputs() - .duration(30).EUt(8).buildAndRegister(); +//macerator.recipeBuilder() +// .inputs() +// .outputs() +// .duration(30).EUt(8).buildAndRegister(); //macerator.findRecipe(2, [], [null]).remove(); -macerator.recipeBuilder() - .inputs() - .outputs() - .duration(30).EUt(8).buildAndRegister(); +//macerator.recipeBuilder() +// .inputs() +// .outputs() +// .duration(30).EUt(8).buildAndRegister(); //macerator.findRecipe(32, [], [null]).remove(); -macerator.recipeBuilder() - .inputs() - .outputs( * 4) - .duration(120).EUt(8).buildAndRegister(); +//macerator.recipeBuilder() +// .inputs() +// .outputs( * 4) +// .duration(120).EUt(8).buildAndRegister(); //macerator.findRecipe(32, [], [null]).remove(); -macerator.recipeBuilder() - .inputs() - .outputs( * 9) - .duration(270).EUt(8).buildAndRegister(); +//macerator.recipeBuilder() +// .inputs() +// .outputs( * 9) +// .duration(270).EUt(8).buildAndRegister(); //macerator.findRecipe(8, [], [null]).remove(); //macerator.recipeBuilder() @@ -224,20 +224,20 @@ macerator.recipeBuilder() //extruder.findRecipe(64, [.withTag({not_consumed: 1 as byte}), * 9], [null]).remove(); //Awakened Draconium -fluidextractor.recipeBuilder() - .inputs() - .fluidOutputs([ * 16]) - .duration(200).EUt(30).buildAndRegister(); - -fluidextractor.recipeBuilder() - .inputs() - .fluidOutputs([ * 144]) - .duration(200).EUt(30).buildAndRegister(); - -fluidextractor.recipeBuilder() - .inputs() - .fluidOutputs([ * 1296]) - .duration(200).EUt(30).buildAndRegister(); +//fluidextractor.recipeBuilder() +// .inputs() +// .fluidOutputs([ * 16]) +// .duration(200).EUt(30).buildAndRegister(); +// +//fluidextractor.recipeBuilder() +// .inputs() +// .fluidOutputs([ * 144]) +// .duration(200).EUt(30).buildAndRegister(); +// +//fluidextractor.recipeBuilder() +// .inputs() +// .fluidOutputs([ * 1296]) +// .duration(200).EUt(30).buildAndRegister(); //fluidextractor.recipeBuilder() // .inputs() @@ -249,32 +249,32 @@ fluidextractor.recipeBuilder() // .fluidOutputs([ * 144]) // .duration(200).EUt(30).buildAndRegister(); -solidifier.recipeBuilder() - .fluidInputs( * 144) - .notConsumable() - .outputs([ * 9]) - .duration(200).EUt(30).buildAndRegister(); - -solidifier.recipeBuilder() - .fluidInputs( * 144) - .notConsumable() - .outputs([]) - .duration(200).EUt(30).buildAndRegister(); - -solidifier.recipeBuilder() - .fluidInputs( * 1296) - .notConsumable() - .outputs([]) - .duration(200).EUt(30).buildAndRegister(); - -solidifier.recipeBuilder() - .fluidInputs( * 144) - .notConsumable() - .outputs([.firstItem]) - .duration(200).EUt(30).buildAndRegister(); - -solidifier.recipeBuilder() - .fluidInputs( * 576) - .notConsumable() - .outputs([.firstItem]) - .duration(200).EUt(30).buildAndRegister(); +//solidifier.recipeBuilder() +// .fluidInputs( * 144) +// .notConsumable() +// .outputs([ * 9]) +// .duration(200).EUt(30).buildAndRegister(); +// +//solidifier.recipeBuilder() +// .fluidInputs( * 144) +// .notConsumable() +// .outputs([]) +// .duration(200).EUt(30).buildAndRegister(); +// +//solidifier.recipeBuilder() +// .fluidInputs( * 1296) +// .notConsumable() +// .outputs([]) +// .duration(200).EUt(30).buildAndRegister(); +// +//solidifier.recipeBuilder() +// .fluidInputs( * 144) +// .notConsumable() +// .outputs([.firstItem]) +// .duration(200).EUt(30).buildAndRegister(); +// +//solidifier.recipeBuilder() +// .fluidInputs( * 576) +// .notConsumable() +// .outputs([.firstItem]) +// .duration(200).EUt(30).buildAndRegister(); diff --git a/scripts/Earlygame.zs b/scripts/Earlygame.zs index c336fa6..ba0923a 100644 --- a/scripts/Earlygame.zs +++ b/scripts/Earlygame.zs @@ -18,6 +18,12 @@ import crafttweaker.item.IItemStack; // [,,]]); //furnace.addRecipe( * 2, , 0.0); +//Ender Pearls +alloy.recipeBuilder().inputs([,]).outputs([]).duration(300).EUt(16).buildAndRegister(); + +//Wrought Iron +furnace.remove(); +furnace.addRecipe(, , 0.0); recipes.remove(); recipes.addShaped( * 2, [ @@ -25,6 +31,13 @@ recipes.addShaped( * 2, [ [, , ], [, , ]]); +//Wood Pulp +recipes.addShapeless( * 4,[,]); + +//Red Alloy Dust +recipes.addShapeless(, [, , , , ]); + + //Iron Shears //recipes.remove(); //recipes.addShaped(,[ @@ -64,7 +77,7 @@ recipes.addShapeless(, [, * 7]).outputs([ * 2, * 2, , * 2]).duration(400).EUt(30).buildAndRegister(); //Photovoltaic Cells -//alloy_smelter.recipeBuilder().inputs([ * 2, ]).outputs([]).duration(180).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([ * 2, ]).outputs([]).duration(180).EUt(16).buildAndRegister(); //Small Gears //alloy_smelter.recipeBuilder().inputs([]).notConsumable().outputs([]).duration(80).EUt(16).buildAndRegister(); @@ -133,10 +146,10 @@ recipes.remove(); recipes.remove(); alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(180).EUt(16).buildAndRegister(); alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(180).EUt(16).buildAndRegister(); -alloy_smelter.recipeBuilder().inputs([, * 4]).outputs([]).duration(800).EUt(16).buildAndRegister(); // Ender Eye Block +alloy_smelter.recipeBuilder().inputs([, * 4]).outputs([]).duration(800).EUt(16).buildAndRegister(); // Ender Eye Block alloy_smelter.recipeBuilder().inputs([, * 4]).outputs([]).duration(800).EUt(16).buildAndRegister(); -//alloy_smelter.recipeBuilder().inputs([, * 4]).outputs([]).duration(400).EUt(16).buildAndRegister(); -//alloy_smelter.recipeBuilder().inputs([, * 4]).outputs([]).duration(400).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, * 4]).outputs([]).duration(400).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, * 4]).outputs([]).duration(400).EUt(16).buildAndRegister(); //Redstone Gear recipes.remove(); @@ -148,24 +161,25 @@ recipes.addShaped(, [ //Photovoltaic Composite -//recipes.remove(); -//recipes.addShapeless( * 3, [,,]); -// -// -//recipes.remove(); -//recipes.remove(); -//recipes.addShaped(, [[, , ]]); +recipes.remove(); +recipes.addShapeless( * 3, [,,]); + +recipes.remove(); +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(); //EIO Alloys -//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(240).EUt(16).buildAndRegister(); -//alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(240).EUt(16).buildAndRegister(); -//alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(120).EUt(16).buildAndRegister(); -//alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(120).EUt(16).buildAndRegister(); -//alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(300).EUt(120).buildAndRegister(); -//alloy_smelter.recipeBuilder().inputs([, ]).outputs([ * 2]).duration(100).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(240).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(240).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(120).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(120).EUt(16).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, ]).outputs([]).duration(300).EUt(120).buildAndRegister(); +alloy_smelter.recipeBuilder().inputs([, ]).outputs([ * 2]).duration(100).EUt(16).buildAndRegister(); //Ender Chest recipes.removeByRecipeName("enderstorage:ender_chest"); @@ -198,30 +212,31 @@ recipes.addShaped(, [ [, , ]]); //Fluid Conduit -//mods.jei.JEI.removeAndHide(); -//recipes.remove(); -//recipes.addShaped( * 4, [ -// [, , ], -// [,,], -// [, , ]]); -//assembler.recipeBuilder().inputs([ * 3, * 6]).outputs([ * 8]).duration(80).EUt(16).buildAndRegister(); +mods.jei.JEI.removeAndHide(); +recipes.remove(); +recipes.addShaped( * 4, [ + [, , ], + [,,], + [, , ]]); +assembler.recipeBuilder().inputs([ * 3, * 6]).outputs([ * 8]).duration(80).EUt(16).buildAndRegister(); macerator.recipeBuilder().inputs([]).outputs([]).duration(80).EUt(8).buildAndRegister(); macerator.recipeBuilder().inputs([]).outputs([]).duration(80).EUt(8).buildAndRegister(); -//macerator.recipeBuilder().inputs([]).outputs([]).duration(500).EUt(16).buildAndRegister(); -//macerator.recipeBuilder().inputs([]).outputs([]).duration(400).EUt(16).buildAndRegister(); -//macerator.recipeBuilder().inputs([]).outputs([]).duration(300).EUt(16).buildAndRegister(); -//macerator.recipeBuilder().inputs([]).outputs([]).duration(200).EUt(16).buildAndRegister(); -//macerator.recipeBuilder().inputs([]).outputs([]).duration(200).EUt(16).buildAndRegister(); + +macerator.recipeBuilder().inputs([]).outputs([]).duration(500).EUt(16).buildAndRegister(); +macerator.recipeBuilder().inputs([]).outputs([]).duration(400).EUt(16).buildAndRegister(); +macerator.recipeBuilder().inputs([]).outputs([]).duration(300).EUt(16).buildAndRegister(); +macerator.recipeBuilder().inputs([]).outputs([]).duration(200).EUt(16).buildAndRegister(); +macerator.recipeBuilder().inputs([]).outputs([]).duration(200).EUt(16).buildAndRegister(); recipes.addShapeless(,[]); recipes.addShapeless(,[]); recipes.remove(); //Yeta Wrench -//recipes.remove(); -//recipes.addShaped(, [ -// [, null, ], -// [null, , null], -// [null,,null]]); +recipes.remove(); +recipes.addShaped(, [ + [, null, ], + [null, , null], + [null,,null]]); //.displayName = "Electric Blast Furnace Controller"; @@ -262,6 +277,7 @@ chemical_reactor.recipeBuilder().inputs([]).fluidI // chemical_reactor.recipeBuilder().inputs([]).fluidInputs( * 1000).outputs().EUt(500).duration(120).buildAndRegister(); mixer.recipeBuilder().inputs([,]).outputs( * 2).EUt(15).duration(80).buildAndRegister(); mixer.recipeBuilder().inputs([,]).outputs( * 2).EUt(15).duration(40).buildAndRegister(); +// Replaced by GTCEu Naq processing //mixer.recipeBuilder().inputs([, * 4,,]).fluidInputs([ * 576, * 144]).outputs().EUt(8000).duration(400).buildAndRegister(); //mixer.recipeBuilder().inputs([,,*4,]).fluidInputs([ * 576, * 144]).outputs().EUt(30000).duration(400).buildAndRegister(); mixer.recipeBuilder().inputs([ * 3, * 2, * 2, * 2]).outputs( * 9).EUt(15).duration(200).buildAndRegister(); @@ -331,7 +347,7 @@ recipes.addShaped(, [[, [[,]]); //Rubber Sheet -//compressor.recipeBuilder().inputs().outputs().duration(20).EUt(8).buildAndRegister(); +compressor.recipeBuilder().inputs().outputs().duration(20).EUt(8).buildAndRegister(); //compressor.recipeBuilder().inputs().outputs().duration(200).EUt(400).buildAndRegister(); compressor.recipeBuilder().inputs( * 2).outputs().duration(20).EUt(4).buildAndRegister(); compressor.recipeBuilder().inputs( * 3).outputs().duration(20).EUt(8).buildAndRegister(); @@ -765,7 +781,7 @@ recipes.addShaped(, [ -//recipes.addShapeless(, [,]); +recipes.addShapeless(, [,]); //recipes.addShapeless(, [, , ]); furnace.addRecipe( * 3, , 0.0); @@ -1054,3 +1070,6 @@ recipes.addShaped("gtce_rotor_mold", , [ // .duration(480).EUt(120).buildAndRegister(); //electrolyzer.findRecipe(60, [null], [ * 1000]).remove(); + +// remove xu2 shortcut hopper +recipes.removeByRecipeName("extrautils2:shortcut_hopper"); \ No newline at end of file diff --git a/scripts/EnderIO.zs b/scripts/EnderIO.zs index 1b0d77c..7ae2a28 100644 --- a/scripts/EnderIO.zs +++ b/scripts/EnderIO.zs @@ -246,101 +246,101 @@ alloy.recipeBuilder() //Ensure Correct Solidification -val liquidMap as IItemStack[][ILiquidStack] = { - : [, , ], - : [, , ], - : [, , ], - : [, , ], - : [, , ], - : [, , ], - : [, , ] -}; +//val liquidMap as IItemStack[][ILiquidStack] = { +// : [, , ], +// : [, , ], +// : [, , ], +// : [, , ], +// : [, , ], +// : [, , ], +// : [, , ] +//}; +// +//for liquid, items in liquidMap { +// +// //Ingots +// solidifier.findRecipe(7, [], [liquid * 144]).remove(); +// solidifier.recipeBuilder() +// .fluidInputs(liquid * 144) +// .notConsumable() +// .outputs(items[0]) +// .duration(20).EUt(8).buildAndRegister(); +// +// //Blocks +// solidifier.findRecipe(7, [], [liquid * 1296]).remove(); +// solidifier.recipeBuilder() +// .fluidInputs(liquid * 1296) +// .notConsumable() +// .outputs(items[1]) +// .duration(98).EUt(8).buildAndRegister(); +// +// //Nuggets +// solidifier.findRecipe(7, [], [liquid * 144]).remove(); +// solidifier.recipeBuilder() +// .fluidInputs(liquid * 144) +// .notConsumable() +// .outputs(items[2] * 9) +// .duration(98).EUt(8).buildAndRegister(); +//} +// +//val packagerArray = [ +// [,], +// [,], +// [,], +// [,], +// [,], +// [,], +// [,] +//] as IItemStack[][]; +// +//for nugget in packagerArray { +// +// compressor.findRecipe(2, [nugget[0] * 9], [null]).remove(); +// +// compressor.recipeBuilder() +// .inputs(nugget[0]*9) +//// .notConsumable(.withTag({Configuration: 1})) +// .outputs(nugget[1]) +// .duration(300).EUt(2).buildAndRegister(); +//} -for liquid, items in liquidMap { - - //Ingots - solidifier.findRecipe(7, [], [liquid * 144]).remove(); - solidifier.recipeBuilder() - .fluidInputs(liquid * 144) - .notConsumable() - .outputs(items[0]) - .duration(20).EUt(8).buildAndRegister(); - - //Blocks - solidifier.findRecipe(7, [], [liquid * 1296]).remove(); - solidifier.recipeBuilder() - .fluidInputs(liquid * 1296) - .notConsumable() - .outputs(items[1]) - .duration(98).EUt(8).buildAndRegister(); - - //Nuggets - solidifier.findRecipe(7, [], [liquid * 144]).remove(); - solidifier.recipeBuilder() - .fluidInputs(liquid * 144) - .notConsumable() - .outputs(items[2] * 9) - .duration(98).EUt(8).buildAndRegister(); -} - -val packagerArray = [ - [,], - [,], - [,], - [,], - [,], - [,], - [,] -] as IItemStack[][]; - -for nugget in packagerArray { - - compressor.findRecipe(2, [nugget[0] * 9], [null]).remove(); - - compressor.recipeBuilder() - .inputs(nugget[0]*9) -// .notConsumable(.withTag({Configuration: 1})) - .outputs(nugget[1]) - .duration(300).EUt(2).buildAndRegister(); -} - -//Furnace Recipes -//End Steel -furnace.remove(, ); -furnace.addRecipe(, ); - -//Vibrant Alloy -furnace.remove(, ); -furnace.addRecipe(, ); - -//Pulsating Iron -furnace.remove(, ); -furnace.addRecipe(, ); - -//Energetic Alloy -furnace.remove(, ); -furnace.addRecipe(, ); - -//Electrical Steel -furnace.remove(, ); -furnace.addRecipe(, ); - -//Dark Steel -furnace.remove(, ); -furnace.addRecipe(, ); -//Fixing Multismelter output of the dusts of the GTCE variants of Ender IO ingots -val materialList as IItemStack[][] = [ - - [, ], - [, ], - [, ], - [, ], - [, ], - [, ], - [, ] - - -] as IItemStack[][]; +////Furnace Recipes +////End Steel +//furnace.remove(, ); +//furnace.addRecipe(, ); +// +////Vibrant Alloy +//furnace.remove(, ); +//furnace.addRecipe(, ); +// +////Pulsating Iron +//furnace.remove(, ); +//furnace.addRecipe(, ); +// +////Energetic Alloy +//furnace.remove(, ); +//furnace.addRecipe(, ); +// +////Electrical Steel +//furnace.remove(, ); +//furnace.addRecipe(, ); +// +////Dark Steel +//furnace.remove(, ); +//furnace.addRecipe(, ); +////Fixing Multismelter output of the dusts of the GTCE variants of Ender IO ingots +//val materialList as IItemStack[][] = [ +// +// [, ], +// [, ], +// [, ], +// [, ], +// [, ], +// [, ], +// [, ] +// +// +//] as IItemStack[][]; //for dust in materialList { diff --git a/scripts/Midgame.zs b/scripts/Midgame.zs index 2e949ae..8289701 100644 --- a/scripts/Midgame.zs +++ b/scripts/Midgame.zs @@ -76,3 +76,11 @@ mixer.recipeBuilder() .inputs([ * 3, ]) .duration(200).EUt(30).buildAndRegister(); +// Draconic Superconductor +vacuum_freezer.recipeBuilder() + .inputs() + .fluidInputs() + .outputs() + .duration(100) + .EUt(6000) + .buildAndRegister(); \ No newline at end of file diff --git a/scripts/ThermalExpansion.zs b/scripts/ThermalExpansion.zs index fb54784..6ebf00e 100644 --- a/scripts/ThermalExpansion.zs +++ b/scripts/ThermalExpansion.zs @@ -328,6 +328,14 @@ recipes.addShaped(, [ .addTooltip(format.darkGray(format.italic("Crafting component only."))); +// Boiler Conversion +recipes.removeByRecipeName("thermalexpansion:augment_25"); +recipes.addShaped(, [ + [null, , null], + [, , ], + [null, , null] +]); + recipes.addShaped(, [ [, , null], [, , ], @@ -416,66 +424,66 @@ val liquidMap as IItemStack[][ILiquidStack] = { //ingot, block, nugget -for liquid,items in liquidMap { - - //Ingots - solidifier.findRecipe(7, [], [liquid * 144]).remove(); - solidifier.recipeBuilder() - .fluidInputs(liquid * 144) - .notConsumable() - .outputs(items[0]) - .duration(20).EUt(8).buildAndRegister(); - - //Blocks - solidifier.findRecipe(7, [], [liquid * 1296]).remove(); - solidifier.recipeBuilder() - .fluidInputs(liquid * 1296) - .notConsumable() - .outputs(items[1]) - .duration(98).EUt(8).buildAndRegister(); - - //Nuggets - solidifier.findRecipe(7, [], [liquid * 144]).remove(); - solidifier.recipeBuilder() - .fluidInputs(liquid * 144) - .notConsumable() - .outputs(items[2] * 9) - .duration(98).EUt(8).buildAndRegister(); -} - -//Correct Packager Recipes - -val packagerArray2 = [ - - [, ], - [, ], - [, ] - -] as IItemStack[][]; - -for nuggets in packagerArray2 { - - compressor.findRecipe(2, [nuggets[0] * 9], [null]).remove(); - - packager.recipeBuilder() - .inputs(nuggets[0] * 9) - .outputs(nuggets[1]) - .duration(300).EUt(2).buildAndRegister(); - -} - -//Furnace Recipes -//Enderium -furnace.remove(, ); -furnace.addRecipe(, ); - -//Signalum -furnace.remove(, ); -furnace.addRecipe(, ); - -//Lumium -furnace.remove(, ); -furnace.addRecipe(, ); +//for liquid,items in liquidMap { +// +// //Ingots +// solidifier.findRecipe(7, [], [liquid * 144]).remove(); +// solidifier.recipeBuilder() +// .fluidInputs(liquid * 144) +// .notConsumable() +// .outputs(items[0]) +// .duration(20).EUt(8).buildAndRegister(); +// +// //Blocks +// solidifier.findRecipe(7, [], [liquid * 1296]).remove(); +// solidifier.recipeBuilder() +// .fluidInputs(liquid * 1296) +// .notConsumable() +// .outputs(items[1]) +// .duration(98).EUt(8).buildAndRegister(); +// +// //Nuggets +// solidifier.findRecipe(7, [], [liquid * 144]).remove(); +// solidifier.recipeBuilder() +// .fluidInputs(liquid * 144) +// .notConsumable() +// .outputs(items[2] * 9) +// .duration(98).EUt(8).buildAndRegister(); +//} +// +////Correct Packager Recipes +// +//val packagerArray2 = [ +// +// [, ], +// [, ], +// [, ] +// +//] as IItemStack[][]; +// +//for nuggets in packagerArray2 { +// +// compressor.findRecipe(2, [nuggets[0] * 9], [null]).remove(); +// +// packager.recipeBuilder() +// .inputs(nuggets[0] * 9) +// .outputs(nuggets[1]) +// .duration(300).EUt(2).buildAndRegister(); +// +//} +// +////Furnace Recipes +////Enderium +//furnace.remove(, ); +//furnace.addRecipe(, ); +// +////Signalum +//furnace.remove(, ); +//furnace.addRecipe(, ); +// +////Lumium +//furnace.remove(, ); +//furnace.addRecipe(, ); //Mana Infused mixer.recipeBuilder() @@ -505,40 +513,40 @@ mods.jei.JEI.addDescription(, "Made in the Crys mods.jei.JEI.addDescription(, "Made in the Crystal Growth Chamber or in a Phytogenic Insolator. If made in the Phytogenic Insolator, make sure to unlock the Fertilizer slot. Augments do not work for this craft."); mods.jei.JEI.addDescription(, "Made in the Crystal Growth Chamber or in a Phytogenic Insolator. If made in the Phytogenic Insolator, make sure to unlock the Fertilizer slot. Augments do not work for this craft."); -val liquids as int[][ILiquidStack] = { - - //Fluid : duration, power - * 73 : [1568, 30], - * 55 : [1019, 30], - * 18 : [392, 30] - -}; - -val blocks = [ - - //Enderium - [, * 9], - //Lumium - [, * 9], - //Signalum - [, * 9], - //Mana Infused - [, * 9] - -] as IItemStack[][]; - -for blockItem in blocks { - - for liquid, values in liquids { - - cutter.recipeBuilder() - .inputs(blockItem[0]) - .fluidInputs(liquid) - .outputs(blockItem[1]) - .duration(values[0]).EUt(values[1]).buildAndRegister(); - - } -} +//val liquids as int[][ILiquidStack] = { +// +// //Fluid : duration, power +// * 73 : [1568, 30], +// * 55 : [1019, 30], +// * 18 : [392, 30] +// +//}; +// +//val blocks = [ +// +// //Enderium +// [, * 9], +// //Lumium +// [, * 9], +// //Signalum +// [, * 9], +// //Mana Infused +// [, * 9] +// +//] as IItemStack[][]; +// +//for blockItem in blocks { +// +// for liquid, values in liquids { +// +// cutter.recipeBuilder() +// .inputs(blockItem[0]) +// .fluidInputs(liquid) +// .outputs(blockItem[1]) +// .duration(values[0]).EUt(values[1]).buildAndRegister(); +// +// } +//} //Add Rubber Trees to Phytogenic Insolator. Why would you use this? mods.thermalexpansion.Insolator.addRecipeSaplingInfuser( * 6, , , 9600, , 100); diff --git a/scripts/_oreDict.zs b/scripts/_oreDict.zs index ab22696..4b649bd 100644 --- a/scripts/_oreDict.zs +++ b/scripts/_oreDict.zs @@ -40,6 +40,11 @@ var blocksDisabled as IItemStack[][IOreDictEntry] = { // ], + #blockDraconiumAwakened + : [ + + ], + #blockBeryllium : [ @@ -67,17 +72,22 @@ var blocksDisabled as IItemStack[][IOreDictEntry] = { #blockConductiveIron : [ - + + ], + + #blockCrystalMatrix + : [ + ], #blockDarkSteel : [ - + ], #blockDraconium : [ - + ], #blockElectrum @@ -87,17 +97,17 @@ var blocksDisabled as IItemStack[][IOreDictEntry] = { #blockElectricalSteel : [ - + ], #blockEndSteel : [ - + ], #blockEnergeticAlloy : [ - + ], #blockGraphite @@ -105,6 +115,11 @@ var blocksDisabled as IItemStack[][IOreDictEntry] = { ], + #blockInfinity + : [ + + ], + #blockInvar : [ @@ -166,7 +181,7 @@ var blocksDisabled as IItemStack[][IOreDictEntry] = { #blockPulsatingIron : [ - + ], #blockTin @@ -182,7 +197,7 @@ var blocksDisabled as IItemStack[][IOreDictEntry] = { #blockVibrantAlloy : [ - + ], #blockTitanium @@ -280,7 +295,7 @@ var dustsDisabled as IItemStack[][IOreDictEntry] = { #dustDraconium : [ - + ], #dustElectrum @@ -490,6 +505,11 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { ], + #ingotDraconiumAwakened + : [ + + ], + #ingotBeryllium : [ @@ -508,7 +528,7 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { #ingotConductiveIron : [ - + ], #ingotCopper @@ -518,6 +538,11 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { // ], + #ingotCrystalMatrix + : [ + + ], + #ingotDarkSteel : [ @@ -525,12 +550,12 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { #ingotDraconium : [ - + ], #ingotElectricalSteel : [ - + ], #ingotElectrum @@ -540,17 +565,17 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { #ingotEnderium : [ - + ], #ingotEndSteel : [ - + ], #ingotEnergeticAlloy : [ - + ], #ingotGraphite @@ -565,7 +590,7 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { #ingotLumium : [ - + ], #ingotOsmiridium @@ -578,6 +603,11 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { ], + #ingotInfinity + : [ + + ], + #ingotInvar : [ @@ -610,7 +640,7 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { #ingotPulsatingIron : [ - + ], #ingotRedstoneAlloy @@ -620,7 +650,7 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { #ingotSignalum : [ - + ], #ingotTin @@ -653,7 +683,7 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { #ingotSignalum : [ - + ], #ingotSteel @@ -665,7 +695,7 @@ var ingotsDisabled as IItemStack[][IOreDictEntry] = { #ingotVibrantAlloy : [ - + ], }; @@ -737,6 +767,10 @@ var nuggetsDisabled as IItemStack[][IOreDictEntry] = { ], + : [ + + ], + : [ ], @@ -747,7 +781,7 @@ var nuggetsDisabled as IItemStack[][IOreDictEntry] = { ], : [ - + ], : [ @@ -1056,6 +1090,11 @@ var gearsDisabled as IItemStack[][IOreDictEntry] = { ], + #gearSignalum + : [ + + ], + #gearSilver : [ @@ -1737,8 +1776,8 @@ 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(); //mods.jei.JEI.removeAndHide(); //mods.jei.JEI.removeAndHide(); @@ -2201,10 +2240,10 @@ solidifier.recipeBuilder().fluidInputs( * 144).notCo fluidextractor.recipeBuilder().inputs().fluidOutputs([ * 144]).duration(20).EUt(30).buildAndRegister(); //Molten Soularium -solidifier.recipeBuilder().fluidInputs( * 1296).notConsumable().outputs([]).duration(400).EUt(30).buildAndRegister(); -solidifier.recipeBuilder().fluidInputs( * 144).notConsumable().outputs([]).duration(40).EUt(30).buildAndRegister(); -fluidextractor.recipeBuilder().inputs().fluidOutputs([ * 144]).duration(20).EUt(30).buildAndRegister(); -fluidextractor.recipeBuilder().inputs().fluidOutputs([ * 1296]).duration(200).EUt(30).buildAndRegister(); +//solidifier.recipeBuilder().fluidInputs( * 1296).notConsumable().outputs([]).duration(400).EUt(30).buildAndRegister(); +//solidifier.recipeBuilder().fluidInputs( * 144).notConsumable().outputs([]).duration(40).EUt(30).buildAndRegister(); +//fluidextractor.recipeBuilder().inputs().fluidOutputs([ * 144]).duration(20).EUt(30).buildAndRegister(); +//fluidextractor.recipeBuilder().inputs().fluidOutputs([ * 1296]).duration(200).EUt(30).buildAndRegister(); diff --git a/scripts/electronics.zs b/scripts/electronics.zs index b567e01..b247a51 100644 --- a/scripts/electronics.zs +++ b/scripts/electronics.zs @@ -8,6 +8,169 @@ import mods.contenttweaker.Color; import mods.gregtech.recipe.RecipeMap; import mods.gregtech.material.MaterialRegistry; import mods.gregtech.material.Material; +import scripts.common.makeShaped as makeShaped; + +.displayName = "Basic RF Capacitor"; +.displayName = "Double-Layer RF Capacitor"; +.displayName = "Octadic RF Capacitor"; + +//Rubber by hand +recipes.addShaped(,[[],[],[]]); + +//Resonant Clathrate +furnace.remove(); +furnace.addRecipe(, , 0.0); + +//EnderIO Conduits +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); + +recipes.addShaped( * 3, [ //Conductive Iron Conduit + [, , ], + [,,], + [, , ]]); +.displayName = "Conductive Iron Energy Conduit"; +assembler.recipeBuilder().inputs([ * 3, * 6]).outputs([ * 4]).duration(80).EUt(16).buildAndRegister(); + +recipes.addShaped( * 3, [ //Energetic Alloy Conduit + [, , ], + [,,], + [, , ]]); +.displayName = "Energetic Alloy Energy Conduit"; +assembler.recipeBuilder().inputs([ * 2, , * 6]).outputs([ * 4]).duration(80).EUt(16).buildAndRegister(); + +recipes.addShaped( * 3, [ //vibrant alloy conduit + [, , ], + [,,], + [, , ]]); +.displayName = "Vibrant Alloy Energy Conduit"; +assembler.recipeBuilder().inputs([ * 2, , * 6]).outputs([ * 4]).duration(80).EUt(16).buildAndRegister(); + +recipes.addShaped( * 3, [ //End Steel Conduit + [, , ], + [,,], + [, , ]]); +.displayName = "End Steel Energy Conduit"; +assembler.recipeBuilder().inputs([ * 2, , * 6]).outputs([ * 4]).duration(80).EUt(16).buildAndRegister(); + +recipes.addShaped( * 3, [ + [, , ], + [, ,], + [, , ]]); +.displayName = "Lumium Energy Conduit"; +assembler.recipeBuilder().inputs([ * 2, , * 6]).outputs([ * 4]).duration(80).EUt(16).buildAndRegister(); + +recipes.addShaped( * 3, [ + [, , ], + [,,], + [, , ]]); +.displayName = "Signalum Energy Conduit"; +assembler.recipeBuilder().inputs([ * 2, , * 6]).outputs([ * 4]).duration(80).EUt(16).buildAndRegister(); + +recipes.addShaped( * 3, [ + [, , ], + [,,], + [, , ]]); +.displayName = "Enderium Energy Conduit"; +assembler.recipeBuilder().inputs([* 2, , * 6]).outputs([ * 4]).duration(80).EUt(16).buildAndRegister(); + +recipes.addShaped( * 3, [ + [, , ], + [,,], + [, , ]]); +.displayName = "Draconium Energy Conduit"; +assembler.recipeBuilder().inputs([* 2, , * 6]).outputs([ * 4]).duration(80).EUt(16).buildAndRegister(); + +//MAX Tier - Superconductor +recipes.addShaped( * 3, [ + [, , ], + [,,], + [, , ]]); +.displayName = "Superconductor Energy Conduit"; +assembler.recipeBuilder().inputs([* 2, , * 6]).outputs([ * 4]).duration(80).EUt(16).buildAndRegister(); + +//Item conduit - by hand +recipes.addShaped( * 4, [ + [, , ], + [,,], + [, , ]]); + +//redstone conduit - by hand +recipes.addShaped( * 4, [ + [, , ], + [,,], + [, , ]]); + +//me conduit - by hand +recipes.addShaped( * 4, [ + [, , ], + [,,], + [, , ]]); + +//ender fluid conduit - by hand +recipes.addShaped( * 4, [ + [, , ], + [,,], + [, , ]]); + +//redstone conduit - assembler +assembler.recipeBuilder() + .inputs([ * 3, * 6]) + .outputs([ * 8]) + .duration(80).EUt(16).buildAndRegister(); + +//item conduit - assembler +assembler.recipeBuilder() + .inputs([ * 3, * 6]) + .outputs([ * 8]) + .duration(80).EUt(16).buildAndRegister(); + +//ender fluid conduit - assembler +assembler.recipeBuilder() + .inputs([ * 2, , * 6]) + .outputs([ * 8]) + .duration(80).EUt(16).buildAndRegister(); + +mods.jei.JEI.removeAndHide(); +mods.jei.JEI.removeAndHide(); +mods.jei.JEI.removeAndHide(); +mods.jei.JEI.removeAndHide(); +mods.jei.JEI.removeAndHide(); +mods.jei.JEI.removeAndHide(); + + +val wrench = ; + +// Microversium Machine Casing +makeShaped("of_microverse_casing", * 2, + ["PPP", + "PWP", + "PPP"], + { P : , //Microversium Ingot + W : wrench}); + +// LuV Machine Casing +makeShaped("of_luv_casing", , + ["PPP", + "PWP", + "PPP"], + { P : , //Lumium Plate + W : wrench}); //LV Hull recipes.remove(); @@ -57,6 +220,7 @@ recipes.addShaped(, [ assembler.recipeBuilder().inputs( * 8).notConsumable(.withTag({Configuration: 8})).outputs([]).duration(30).EUt(16).buildAndRegister(); + // pyro pyrolyse_oven.recipeBuilder() .inputs([ * 16]) @@ -122,9 +286,34 @@ pyrolyse_oven.recipeBuilder() // force phenol for phenolic circuit board chemical_reactor.recipeBuilder().inputs().fluidInputs([ * 100]).outputs([]).duration(100).EUt(8).buildAndRegister(); - // remove Phenolic Circuit Board * 1 .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.addShaped(, [ + [null, null, null], + [, , ], + [, , ] +]); + +recipes.removeByRecipeName("gregtech:coated_board"); +recipes.removeByRecipeName("gregtech:coated_board_1x"); +recipes.addShaped( * 3, [ + [, , ], + [, , ], + [, , ] +]); \ No newline at end of file diff --git a/scripts/extendedcrafting.zs b/scripts/extendedcrafting.zs index a504d31..47cdd48 100644 --- a/scripts/extendedcrafting.zs +++ b/scripts/extendedcrafting.zs @@ -483,8 +483,8 @@ makeExtremeRecipe9(, ////////////////////////// Infinity Ingot /////////////////////// -mods.avaritia.ExtremeCrafting.remove(); -makeExtremeRecipe9(, +//mods.avaritia.ExtremeCrafting.remove(); +makeExtremeRecipe9(, [" ", " ABBB", " ABBBCDB", @@ -558,16 +558,16 @@ val creativejetpack = .withTag({JetpackParticleType: makeExtremeRecipe9( * 2, ["ABBBBBBBA", - "BCTGDEFCB", - "BFSEHGSTB", + "BCTGDETCB", + "BFSEHGSFB", "BUJXIXJUB", - "BCSWKWSCB", + "BNSWKWSNB", "BUJXLXJUB", - "BTSEMGSFB", - "BCFGDETCB", + "BFSEMGSFB", + "BCTGDETCB", "ABBBBBBBA"], { A : , - B : , + B : , C : , D : creativecell.only(isCreative), E : , @@ -579,8 +579,9 @@ makeExtremeRecipe9( * 2, K : , L : , M : , + N : , S : , - T : creativetank.only(isCreative), + T : , U : , W : .withTag({Water: 0, Mode: 4}, false), X : .withTag({Energy: 250000000}, false) @@ -635,7 +636,7 @@ makeExtremeRecipe9(, " CB ", " C B ", "N "], - { A : , + { A : , B : , C : , D : , @@ -664,6 +665,19 @@ makeExtremeRecipe9(, G : , H : }); +// GT Infinite Energy +mods.extendedcrafting.TableCrafting.addShaped(0, , [ + [, , , , , , , , ], + [, , , , , , , , ], + [, , , , , , , , ], + [, , , , , , , , ], + [, , , , , , , , ], + [, , , , , , , , ], + [, , , , , , , , ], + [, , , , , , , , ], + [, , , , , , , , ] +]); + makeExtremeRecipe9(, ["AABCDCBAA", "ABCDEDCBA", diff --git a/scripts/materials.zs b/scripts/materials.zs index ea234d0..8baa108 100644 --- a/scripts/materials.zs +++ b/scripts/materials.zs @@ -37,7 +37,7 @@ var dark_steel = MaterialBuilder(32003, "dark_steel") .ingot().fluid() .color(0x414751).iconSet("DULL") .flags(["generate_plate", "generate_rod", "generate_frame", "disable_decomposition"]) - .components([ * 1, * 1]) + .components([ * 1]) .build(); var omnium = MaterialBuilder(32004, "omnium") @@ -47,10 +47,10 @@ var omnium = MaterialBuilder(32004, "omnium") .cableProperties(2147483647, 1, 0, true) .build(); -var black_quartz = MaterialBuilder(32005, "black_quartz") - .gem() - .color(0x17151a).iconSet("QUARTZ") - .build(); +//var black_quartz = MaterialBuilder(32005, "black_quartz") +// .gem() +// .color(0x17151a).iconSet("QUARTZ") +// .build(); var ardite = MaterialBuilder(32006, "ardite") .ingot().fluid() @@ -75,7 +75,7 @@ var signalum = MaterialBuilder(32010, "signalum") .ingot().fluid() .color(0xff7f0f).iconSet("SHINY") .blastTemp(4000) - .flags(["generate_plate", "generate_dense", "generate_rod"]) + .flags(["generate_plate", "generate_dense", "generate_rod", "generate_gear"]) .components([ * 4, * 2, * 2]) .cableProperties(32768, 1, 0, true) .build(); @@ -167,14 +167,16 @@ var crystal_matrix = MaterialBuilder(32023, "crystal_matrix") .build(); var soularium = MaterialBuilder(32024, "soularium") - .ingot() + .ingot().fluid() .color(0x3b0d0d).iconSet("DULL") + .components([ * 1]) .build(); var end_steel = MaterialBuilder(32025, "end_steel") .ingot().fluid() .color(0xd6d980).iconSet("DULL") .flags("generate_plate") + .cableProperties(2048,1,0,true) .build(); var infinity = MaterialBuilder(32026, "infinity") @@ -189,11 +191,11 @@ var microversium = MaterialBuilder(32027, "microversium") .flags("generate_plate", "generate_frame") .build(); -//var quantum_fluxed_eternium = MaterialBuilder(32028, "quantum_fluxed_eternium") -// .ingot() -// .color(0xf55c3d).iconSet("SHINY") -// .flags(["generate_plate"]) -// .build(); +var draconic_superconductor = MaterialBuilder(32028, "draconic_superconductor") + .ingot() + .color(0xf5f0f4).iconSet("SHINY") + .cableProperties(2147483647, 4, 0, true) + .build(); MaterialRegistry.get("niobium").addOre(); MaterialRegistry.get("osmium").addOre(); diff --git a/scripts/multiblocks.zs b/scripts/multiblocks.zs index e73f54f..c549cf5 100644 --- a/scripts/multiblocks.zs +++ b/scripts/multiblocks.zs @@ -994,8 +994,8 @@ naquadah_reactor_2.recipeMap // lapidary dynamo large_lapidary_dynamo.recipeMap .recipeBuilder() - .duration(300) - .EUt(-2048) + .duration(19200) + .EUt(-32) .inputs() .buildAndRegister();