TMC/modded7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Merge pull request #1 from tracer4b/main

Browse Source 
pull from source
This commit is contained in:
Mark Crewson 2022-06-07 18:40:03 -07:00 committed by GitHub
commit c958006cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overrides/config/betterquesting/DefaultQuests.json
View File

@ -36958,7 +36958,7 @@
"ismain:1": 1,
"repeat_relative:1": 1,
"name:8": "Neutronium Ingot",
"desc:8": "§6Neutronium§r is a hyper-dense material normally found in the hearts of neutron stars: the collapsed cores of stars between ten and thirty times the size of the sun.\n\nFun fact: a single neutronium block is approximately 2884 million metric tons and somewhere around 600000K, yet you\u0027re somehow capable of holding one with your bare hands. Don\u0027t think about it too much.\n\nNeutronium is made from fusing molten §9Naquadria§r, a super-enriched form of §6Naquadah§r, with molten §9Americium§r. These bad boys require a LOT of time to fuse.\n\nParallelizing fluid crafting is tricky business (and Mark 3 reactors are expensive), but several could be used to speed up the processing. Try to minimize your reactor\u0027s downtime and be very careful about supplying your reactors with stable power.\n\nAfter getting §6Chaotic Fusion Injectors§r, you might consider using Tier Nine Micro Miners to supplement the fusion, as it is net-positive for Neutronium. These miners are expensive though, so it\u0027s up to you.\n"
"desc:8": "§6Neutronium§r is a hyper-dense material normally found in the hearts of neutron stars: the collapsed cores of stars between ten and thirty times the size of the sun.\n\nFun fact: a single neutronium block is approximately 2884 million metric tons and somewhere around 600000K, yet you\u0027re somehow capable of holding one with your bare hands. Don\u0027t think about it too much.\n\nNeutronium is made from fusing molten §9Naquadria§r, a super-enriched form of §6Naquadah§r, with molten §9Americium§r. \n\nAfter getting §6Chaotic Fusion Injectors§r, you might consider using Tier Nine Micro Miners to supplement the fusion, as it is net-positive for Neutronium. These miners are expensive though, so it\u0027s up to you.\n"
}
},
"tasks:9": {

7
overrides/config/betterquesting/saved_quests/ExpertQuests.json
View File

@ -30707,9 +30707,9 @@
"autoConsume:1": 0,
"requiredItems:9": {
"0:10": {
"id:8": "gregtech:meta_item_1",
"id:8": "gregtech:meta_ingot",
"Count:3": 64,
"Damage:2": 10976,
"Damage:2": 32027,
"OreDict:8": ""
}
},
@ -31375,7 +31375,7 @@
"ismain:1": 1,
"repeat_relative:1": 1,
"name:8": "Neutronium Ingot",
"desc:8": "§6Neutronium§r is a hyper-dense material normally found in the hearts of neutron stars: the collapsed cores of stars between ten and thirty times the size of the sun.\n\nFun fact: a single neutronium block is approximately 2884 million metric tons and somewhere around 600000K, yet you\u0027re somehow capable of holding one with your bare hands. Don\u0027t think about it too much.\n\nNeutronium is made from fusing molten §9Naquadria§r, a super-enriched form of §6Naquadah§r, with molten §9Americium§r. These bad boys require a LOT of time to fuse.\n\nParallelizing fluid crafting is tricky business (and Mark 3 reactors are expensive), but several could be used to speed up the processing. Try to minimize your reactor\u0027s downtime and be very careful about supplying your reactors with stable power.\n\nAfter getting §6Chaotic Fusion Injectors§r, you might consider using Tier Nine Micro Miners to supplement the fusion, as it is net-positive for Neutronium. These miners are expensive though, so it\u0027s up to you.\n"
"desc:8": "§6Neutronium§r is a hyper-dense material normally found in the hearts of neutron stars: the collapsed cores of stars between ten and thirty times the size of the sun.\n\nFun fact: a single neutronium block is approximately 2884 million metric tons and somewhere around 600000K, yet you\u0027re somehow capable of holding one with your bare hands. Don\u0027t think about it too much.\n\nNeutronium is made from fusing molten §9Naquadria§r, a super-enriched form of §6Naquadah§r, with molten §9Americium§r. \n\nAfter getting §6Chaotic Fusion Injectors§r, you might consider using Tier Nine Micro Miners to supplement the fusion, as it is net-positive for Neutronium. These miners are expensive though, so it\u0027s up to you.\n"
}
},
"tasks:9": {
@ -41193,7 +41193,6 @@
},
"rewards:9": {},
"preRequisites:11": [
243,
325
],
"questID:3": 802

48
overrides/config/enderio/recipes/user/SliceNSplice.xml
View File

@ -17,7 +17,7 @@
<recipe name="Guardian Diode One Bonus Omni">
<slicing energy="40000">
<input name="ingotEnergeticAlloy"/><input name="gemPrismarine"/><input name="ingotEnergeticAlloy"/>
<input name="dustPrismarine"/><input name="gregtech:meta_item_2:32441"/><input name="dustPrismarine"/>
<input name="dustPrismarine"/><input name="gregtech:meta_item_1:372"/><input name="dustPrismarine"/>
<output name="skullGuardianDiode" amount="2" />
</slicing>
</recipe>
@ -25,11 +25,19 @@
<recipe name="Guardian Diode Two Bonus Omni">
<slicing energy="80000">
<input name="ingotEnergeticAlloy"/><input name="gemPrismarine"/><input name="ingotEnergeticAlloy"/>
<input name="dustPrismarine"/><input name="gregtech:meta_item_2:32442"/><input name="dustPrismarine"/>
<input name="dustPrismarine"/><input name="gregtech:meta_item_1:373"/><input name="dustPrismarine"/>
<output name="skullGuardianDiode" amount="4"/>
</slicing>
</recipe>
<recipe name="Guardian Diode Three Bonus Omni">
<slicing energy="160000">
<input name="ingotEnergeticAlloy"/><input name="gemPrismarine"/><input name="ingotEnergeticAlloy"/>
<input name="dustPrismarine"/><input name="gregtech:meta_item_1:374"/><input name="dustPrismarine"/>
<output name="skullGuardianDiode" amount="8"/>
</slicing>
</recipe>
<!-- Skeletal Contractor -->
@ -46,7 +54,7 @@
<recipe name="Skeletal Contractor One Bonus Omni">
<slicing energy="40000">
<input name="ingotSoularium"/><input name="minecraft:skull:0"/><input name="ingotSoularium"/>
<input name="minecraft:rotten_flesh"/><input name="gregtech:meta_item_2:32441"/><input name="minecraft:rotten_flesh"/>
<input name="minecraft:rotten_flesh"/><input name="gregtech:meta_item_1:372"/><input name="minecraft:rotten_flesh"/>
<output name="skullSkeletalContractor" amount="2"/>
</slicing>
</recipe>
@ -54,11 +62,19 @@
<recipe name="Skeletal Contractor Two Bonus Omni">
<slicing energy="80000">
<input name="ingotSoularium"/><input name="minecraft:skull:0"/><input name="ingotSoularium"/>
<input name="minecraft:rotten_flesh"/><input name="gregtech:meta_item_2:32442"/><input name="minecraft:rotten_flesh"/>
<input name="minecraft:rotten_flesh"/><input name="gregtech:meta_item_1:373"/><input name="minecraft:rotten_flesh"/>
<output name="skullSkeletalContractor" amount="4"/>
</slicing>
</recipe>
<recipe name="Skeletal Contractor Three Bonus Omni">
<slicing energy="160000">
<input name="ingotSoularium"/><input name="minecraft:skull:0"/><input name="ingotSoularium"/>
<input name="minecraft:rotten_flesh"/><input name="gregtech:meta_item_1:374"/><input name="minecraft:rotten_flesh"/>
<output name="skullSkeletalContractor" amount="8"/>
</slicing>
</recipe>
<!-- Ender Resonator -->
<recipe name="Ender Resonator"><disabled/></recipe>
@ -74,7 +90,7 @@
<recipe name="Ender Resonator One Bonus Omni">
<slicing energy="40000">
<input name="ingotSoularium"/><input name="enderio:block_enderman_skull:0"/><input name="ingotSoularium"/>
<input name="gregtech:meta_item_2:32441"/><input name="ingotVibrantAlloy"/><input name="gregtech:meta_item_2:32441"/>
<input name="gregtech:meta_item_1:372"/><input name="ingotVibrantAlloy"/><input name="gregtech:meta_item_1:372"/>
<output name="skullEnderResonator" amount="2"/>
</slicing>
</recipe>
@ -82,11 +98,19 @@
<recipe name="Ender Resonator Two Bonus Omni">
<slicing energy="80000">
<input name="ingotSoularium"/><input name="enderio:block_enderman_skull:0"/><input name="ingotSoularium"/>
<input name="gregtech:meta_item_2:32442"/><input name="ingotVibrantAlloy"/><input name="gregtech:meta_item_2:32442"/>
<input name="gregtech:meta_item_1:373"/><input name="ingotVibrantAlloy"/><input name="gregtech:meta_item_1:373"/>
<output name="skullEnderResonator" amount="4"/>
</slicing>
</recipe>
<recipe name="Ender Resonator Three Bonus Omni">
<slicing energy="160000">
<input name="ingotSoularium"/><input name="enderio:block_enderman_skull:0"/><input name="ingotSoularium"/>
<input name="gregtech:meta_item_1:374"/><input name="ingotVibrantAlloy"/><input name="gregtech:meta_item_1:374"/>
<output name="skullEnderResonator" amount="8"/>
</slicing>
</recipe>
<!-- Z Logic Controller -->
<recipe name="Controller Skull"><disabled/></recipe>
@ -102,7 +126,7 @@
<recipe name="Z Logic Controller One Bonus Omni">
<slicing energy="40000">
<input name="ingotSoularium"/><input name="minecraft:skull:2"/><input name="ingotSoularium"/>
<input name="gregtech:meta_item_2:32441"/><input name="dustRedstone"/><input name="gregtech:meta_item_2:32441" />
<input name="gregtech:meta_item_1:372"/><input name="dustRedstone"/><input name="gregtech:meta_item_1:372" />
<output name="skullZombieController" amount="2"/>
</slicing>
</recipe>
@ -110,11 +134,19 @@
<recipe name="Z Logic Controller Two Bonus Omni">
<slicing energy="80000">
<input name="ingotSoularium"/><input name="minecraft:skull:2"/><input name="ingotSoularium"/>
<input name="gregtech:meta_item_2:32442"/><input name="dustRedstone"/><input name="gregtech:meta_item_2:32442" />
<input name="gregtech:meta_item_1:373"/><input name="dustRedstone"/><input name="gregtech:meta_item_1:373" />
<output name="skullZombieController" amount="4"/>
</slicing>
</recipe>
<recipe name="Z Logic Controller Three Bonus Omni">
<slicing energy="160000">
<input name="ingotSoularium"/><input name="minecraft:skull:2"/><input name="ingotSoularium"/>
<input name="gregtech:meta_item_1:374"/><input name="dustRedstone"/><input name="gregtech:meta_item_1:374" />
<output name="skullZombieController" amount="8"/>
</slicing>
</recipe>
<!-- Dead End Recipe Removals -->

1
overrides/scripts/JetpacksAndEnergyStorage.zs
View File

@ -385,6 +385,7 @@ alloy.recipeBuilder()
// fused quartz
alloy.recipeBuilder()
.inputs([<minecraft:quartz> * 3])
.notConsumable(<metaitem:shape.mold.block>)
.outputs([<enderio:block_fused_quartz>])
.duration(80).EUt(16).buildAndRegister();

4
overrides/scripts/Nuclearcraft.zs
View File

@ -676,14 +676,14 @@ alloy.recipeBuilder()
reactor.recipeBuilder()
large_chemical_reactor.recipeBuilder()
.outputs(<nuclearcraft:gem_dust:1>)
.inputs([<ore:orePyrolusite> * 6])
.fluidInputs([<liquid:sulfuric_acid> * 3000])
.fluidOutputs([<liquid:manganese> * 4320])
.duration(200).EUt(2000).buildAndRegister();
reactor.recipeBuilder()
large_chemical_reactor.recipeBuilder()
.outputs(<nuclearcraft:gem_dust:1>)
.inputs([<ore:oreRedstone> * 12])
.fluidInputs([<liquid:sulfuric_acid> * 6000])

13
overrides/scripts/normalmode.zs
View File

@ -207,6 +207,19 @@ primitive_blast_furnace.recipeBuilder()
.EUt(1)
.buildAndRegister();
primitive_blast_furnace.recipeBuilder()
.inputs([<metaitem:ingotWroughtIron> * 2, <metaitem:gemCoke>])
.outputs([<metaitem:ingotSteel> * 2, <metaitem:dustTinyDarkAsh> * 4])
.duration(800)
.EUt(1)
.buildAndRegister();
primitive_blast_furnace.recipeBuilder()
.inputs([<metaitem:ingotWroughtIron> * 2, <metaitem:dustCoke>])
.outputs([<metaitem:ingotSteel> * 2, <metaitem:dustTinyDarkAsh> * 4])
.duration(800)
.EUt(1)
.buildAndRegister();
// Creative Tank Data
extractor.recipeBuilder()
.inputs(<contenttweaker:heartofauniverse>)