diff --git a/overrides/resources/contenttweaker/lang/en_us.lang b/overrides/resources/contenttweaker/lang/en_us.lang index f359fc8..000871f 100644 --- a/overrides/resources/contenttweaker/lang/en_us.lang +++ b/overrides/resources/contenttweaker/lang/en_us.lang @@ -26,6 +26,7 @@ material.draconic_superconductor=Draconic Superconductor material.fluix=Fluix material.osmiridium_8020=Osmiridium 80/20 material.iridosmine_8020=Iridosmine 80/20 +material.kaemanite=Kaemanite item.contenttweaker.omnicoin.name=Omnipenny [1] item.contenttweaker.omnicoin5.name=Omninickel [5] diff --git a/overrides/scripts/AE2.zs b/overrides/scripts/AE2.zs index b49af16..4ef211c 100644 --- a/overrides/scripts/AE2.zs +++ b/overrides/scripts/AE2.zs @@ -374,3 +374,25 @@ macerator.recipeBuilder() .outputs() .inputs() .duration(45).EUt(8).buildAndRegister(); + +// certus block +recipes.removeByRecipeName("appliedenergistics2:decorative/certus_quartz_block"); +recipes.addShaped(, [ + [, ], + [, ] +]); + +// Oredict Storage Bus +recipes.removeByRecipeName("appliedenergistics2:network/parts/oredict_storage_bus"); +recipes.removeByRecipeName("appliedenergistics2:network/parts/oredict_storage_bus_alt"); +recipes.addShapeless("nf_oredict_storage_bus", + , + [, ]); + +// Extended Processing Pattern Terminal +recipes.removeByRecipeName("appliedenergistics2:network/parts/terminal_expanded_processing"); +recipes.addShaped("nf_terminal_expanded_processing", , [ + [null, , null], + [null, , null], + [null, , null] +]); \ No newline at end of file diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs index 4219ce2..2b20402 100644 --- a/overrides/scripts/electronics.zs +++ b/overrides/scripts/electronics.zs @@ -234,7 +234,7 @@ recipes.addShaped(, [ recipes.remove(); recipes.addShaped(, [ [, , ], - [, , ]]); + [, , ]]); // pyro diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs index 213aec8..fd66d96 100644 --- a/overrides/scripts/materials.zs +++ b/overrides/scripts/materials.zs @@ -202,6 +202,15 @@ var iridosmine_8020 = MaterialBuilder(32030, "iridosmine_8020") .addOreByproducts(, , ) .build(); +var kaemanite = MaterialBuilder(32031, "kaemanite") + .dust() + .components([ * 1, * 1, * 4]) + .color(0xe7413c).iconSet("bright") + .ore() + .addOreByproducts(, , ) + .washedIn() + .build(); + .addIngot(); .addIngot(); .addIngot(); diff --git a/overrides/scripts/multiblocks.zs b/overrides/scripts/multiblocks.zs index f02fc7e..645b163 100644 --- a/overrides/scripts/multiblocks.zs +++ b/overrides/scripts/multiblocks.zs @@ -583,7 +583,7 @@ microverse_projector_advanced.recipeMap * 64) .buildAndRegister(); -// t5 naquadah sheldonite +// t5 naquadah sheldonite trinium microverse_projector_advanced.recipeMap .recipeBuilder() .duration(1000) @@ -593,9 +593,10 @@ microverse_projector_advanced.recipeMap * 32) .outputs( * 64, * 64, - * 64, - * 64, - * 32) + * 64, + * 64, + * 64, + * 64) .buildAndRegister();