Merge remote-tracking branch 'original/master'

This commit is contained in:
LordMZTE 2020-08-15 16:20:35 +02:00
commit d91c4eb94f
4 changed files with 821 additions and 31 deletions

View file

@ -9,6 +9,6 @@
selectedVersion = -1
[Downloads]
#The maximum number of threads that will be used for downloads
maxThreads = 5
maxThreads = 2
#The timeout of http requests in ms
httpTimeout = 2147483647
httpTimeout = 2147483647

View file

@ -0,0 +1,410 @@
{
"registryname": "alloyfurnace",
"localizedname": "Alloy Furnace",
"color": "52525B",
"parts": [
{
"x": -1,
"y": 0,
"z": 0,
"elements": [
"enderio:block_alloy_smelter@0"
]
},
{
"x": -2,
"y": 0,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": 0,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": 0,
"z": 2,
"elements": [
"modularmachinery:blockenergyinputhatch"
]
},
{
"x": 0,
"y": 0,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": 3,
"z": 1,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": 1,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": -1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": 1,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 3,
"z": 1,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -1,
"y": -1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": 1,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": 1,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": -1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": -1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": 1,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -1,
"y": -1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": 1,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": -1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": 4,
"z": 1,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": 2,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -1,
"y": 4,
"z": 1,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -1,
"y": 2,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 4,
"z": 1,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 2,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": 2,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": 0,
"z": 1,
"elements": [
"modularmachinery:blockoutputbus"
]
},
{
"x": -1,
"y": 2,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 2,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 0,
"z": 1,
"elements": [
"modularmachinery:blockinputbus"
]
},
{
"x": -2,
"y": 3,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -1,
"y": 3,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 3,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": 3,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": 1,
"z": 1,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -1,
"y": 3,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 3,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 1,
"z": 1,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": -1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": -1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": -1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": 4,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -1,
"y": 4,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 4,
"z": 0,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": 4,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -2,
"y": 2,
"z": 1,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": -1,
"y": 4,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 4,
"z": 2,
"elements": [
"enderio:block_alloy@6"
]
},
{
"x": 0,
"y": 2,
"z": 1,
"elements": [
"enderio:block_alloy@6"
]
}
]}

View file

@ -1,31 +1,392 @@
{
"registryname": "engine",
"localizedname": "Electrical Engine",
"color": "52525B",
"registryname": "engine",
"localizedname": "Electrical Engine",
"color": "52525B",
"parts": [
{
"x": 0,
"y": 0,
"z": 1,
"elements": [
"modulardiversity:blockmystmechoutput@0"
]
},
{
"x": 0,
"y": -1,
"z": 1,
"elements": [
"libvulpes:coil0@4"
]
},
{
"x": 0,
"y": -1,
"z": 0,
"elements": [
"modularmachinery:blockenergyinputhatch"
]
}
]
}
{
"x": -1,
"y": 0,
"z": 0,
"elements": [
"modularmachinery:blockoutputbus"
]
},
{
"x": -1,
"y": 0,
"z": 1,
"elements": [
"gregtech:wire_coil"
]
},
{
"x": -2,
"y": 0,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": 0,
"z": 1,
"elements": [
"gregtech:wire_coil"
]
},
{
"x": 1,
"y": 0,
"z": 0,
"elements": [
"modularmachinery:blockinputbus"
]
},
{
"x": -2,
"y": 0,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": 0,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 1,
"y": 0,
"z": 1,
"elements": [
"gregtech:wire_coil"
]
},
{
"x": 0,
"y": 0,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 2,
"y": 0,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 2,
"y": 0,
"z": 1,
"elements": [
"modularmachinery:blockenergyinputhatch"
]
},
{
"x": 1,
"y": 0,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 2,
"y": 0,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 2,
"y": -1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 1,
"y": -1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": 1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": -1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": 1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": 1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": -1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": 1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": 1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": 1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": 1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 1,
"y": 1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": -1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": -1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": 1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": 1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 1,
"y": 1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": -1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 2,
"y": 1,
"z": 0,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": -1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 1,
"y": 1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": -1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 2,
"y": 1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -1,
"y": -1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 2,
"y": 1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 0,
"y": -1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 1,
"y": -1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 1,
"y": -1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 2,
"y": -1,
"z": 1,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": 2,
"y": -1,
"z": 2,
"elements": [
"modularmachinery:blockcasing"
]
},
{
"x": -2,
"y": 0,
"z": 1,
"elements": [
"modulardiversity:blockmystmechoutput"
]
}
]}

View file

@ -8,6 +8,13 @@ blast_furnace.recipeBuilder()
.duration(120)
.EUt(120)
.buildAndRegister();
var ult = mods.modularmachinery.RecipeBuilder.newBuilder("ultimate", "alloyfurnace", 120);
ult.addEnergyPerTickInput(1024);
ult.addItemInput(<avaritia:resource:4> * 1);
ult.addItemInput(<avaritia:resource:1> * 1);
ult.addItemInput(<avaritia:resource:6> * 1);
ult.addItemOutput(<extendedcrafting:material:32> * 3);
ult.build();
recipes.remove(<avaritia:extreme_crafting_table>);
recipes.remove(<projecte:item.pe_philosophers_stone>);
recipes.remove(<ageofminecraft:mob_spawner_spc>);
@ -19,6 +26,10 @@ recipes.remove(<rftools:machine_frame>);
recipes.remove(<rftoolsdim:empty_dimension_tab>);
recipes.remove(<projecte:collector_mk1>);
recipes.remove(<avaritia:resource:1>);
recipes.remove(<ageofminecraft:commandingstaff>);
recipes.remove(<ageofminecraft:convertingstaff>);
recipes.remove(<ageofminecraft:heromaker>);
recipes.remove(<deepmoblearning:machine_casing>);
mods.bloodmagic.BloodAltar.addRecipe(<projecte:item.pe_philosophers_stone>, <botania:manaresource:9>, 4, 2000,30,40);
mods.extendedcrafting.TableCrafting.addShaped(0, <ageofminecraft:mob_spawner_spc>, [
[<extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>, <extendedcrafting:material:48>],
@ -82,3 +93,11 @@ mods.extendedcrafting.TableCrafting.addShaped(0, <avaritia:block_resource:1>, [
[<bloodmagic:slate:4>, <projecte:item.pe_matter:1>, <projecte:item.pe_matter:1>, <projecte:item.pe_matter:1>, <bloodmagic:slate:4>],
[<ore:ingotUnstable>, <bloodmagic:slate:4>, <ore:ingotMelodicAlloy>, <bloodmagic:slate:4>, <ore:ingotCrystallinePinkSlime>]
]);
mods.extendedcrafting.EnderCrafting.addShaped(<ageofminecraft:heromaker>, [
[null, <ore:ingotUltimate>, null],
[<ore:ingotUltimate>, <ore:gemNetherStar>, <ore:ingotUltimate>],
[null, <ore:ingotUltimate>, null]
], 10);
recipes.addShaped(<minecraft:barrier>, [[null, <avaritia:resource:6>, null],[null, <minecraft:glass>, null], [null, <avaritia:resource:6>, null]]);
recipes.addShaped(<projecte:item.pe_tome>, [[null, <avaritia:resource:6>, null],[<projecte:item.pe_klein_star:5>, <minecraft:book>, <projecte:item.pe_klein_star:5>], [null, <avaritia:resource:6>, null]]);
recipes.addShaped(<deepmoblearning:machine_casing>, [[<deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>],[<deepmoblearning:soot_covered_plate>, <enderio:item_material:53>, <deepmoblearning:soot_covered_plate>], [<deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>, <deepmoblearning:soot_covered_plate>]]);