Skip to content

Commit d357def

Browse files
mczphmczph
committed
1.61 done
1 parent 314ba5f commit d357def

File tree

6 files changed

+77
-33
lines changed

6 files changed

+77
-33
lines changed

‎groovy/postInit/Avaritia.groovy‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
mods.avaritia.ExtremeCrafting.removeByOutput(item('avaritia:resource', 6))
2+
3+
mods.avaritia.ExtremeCrafting.shapedBuilder()
4+
.matrix([[null,null,null,null,null,null,null,null,null],
5+
[null, null, null, null, item('avaritia:resource', 5), item('avaritia:resource', 5), item('avaritia:resource', 5), null, null],
6+
[null, item('avaritia:resource', 5), item('avaritia:resource', 5), item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5), null],
7+
[item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritiatweaks:infinitato'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5)],
8+
[item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritiatweaks:infinitato'), item('extendedcrafting:material', 13), item('avaritiatweaks:infinitato'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5)],
9+
[item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritiatweaks:infinitato'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5)],
10+
[null, item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5), item('avaritia:resource', 5), item('avaritia:resource', 5), null],
11+
[null, null, item('avaritia:resource', 5), item('avaritia:resource', 5), item('avaritia:resource', 5), null, null, null, null],
12+
[null,null,null,null,null,null,null,null,null]])
13+
.output(item('avaritia:resource',6))
14+
.register()

‎groovy/postInit/ExtendedCrafting.groovy‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,15 @@ mods.extendedcrafting.TableCrafting.addShaped(4, item('environmentaltech:void_or
1111
])
1212

1313
mods.extendedcrafting.TableCrafting.addShaped(4, item("botania:pool", 1), [
14-
[ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('gearGaia'), ore('gearGaia'), ore('gearGaia'), ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('ore:runeAsgard')],
15-
[ore('ore:runeAsgard'), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), ore('ore:runeAsgard')],
16-
[ore('ore:runeAsgard'), item('botania:pool', 3), ore('runeLustB'), ore('runeGluttonyB'), item('botanicadds:rune_energy'), ore('runeSlothB'), ore('runeWrathB'), item('botania:pool', 3), ore('ore:runeAsgard')],
14+
[ore('runeAsgard'), ore('runeAsgard'), ore('runeAsgard'), ore('gearGaia'), ore('gearGaia'), ore('gearGaia'), ore('runeAsgard'), ore('runeAsgard'), ore('runeAsgard')],
15+
[ore('runeAsgard'), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), ore('runeAsgard')],
16+
[ore('runeAsgard'), item('botania:pool', 3), ore('runeLustB'), ore('runeGluttonyB'), item('botanicadds:rune_energy'), ore('runeSlothB'), ore('runeWrathB'), item('botania:pool', 3), ore('runeAsgard')],
1717
[ore('gearGaia'), ore('runeEnvyB'), item('botania:lens', 14), item('botania:lens', 15), ore('singularityMirion'), item('botania:lens', 16), item('botania:lens', 20), ore('runeEarthB'), ore('gearGaia')],
1818
[ore('gearGaia'), ore('runeSpringB'), ore('runeFireB'), ore('singularityMirion'), item('auraddons:item_creative_aura_cache'), ore('singularityMirion'), ore('runeWaterB'), ore('runeManaB'), ore('gearGaia')],
1919
[ore('gearGaia'), ore('runeAirB'), item('botania:lens', 21), item('botania:lens', 22), item('botania_tweaks:compressed_tiny_potato_8'), item('botania:lens', 10), item('botania:lens', 23), ore('runeWinterB'), ore('gearGaia')],
20-
[ore('ore:runeAsgard'), item('botanicadds:pool_dreaming'), ore('runePrideB'), ore('runeSummerB'), item('botanicadds:rune_tp'), ore('runeGreedB'), ore('runeAutumnB'), item('botanicadds:pool_dreaming'), ore('ore:runeAsgard')],
21-
[ore('ore:runeAsgard'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), ore('ore:runeAsgard')],
22-
[ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('gearGaia'), ore('gearGaia'), ore('gearGaia'), ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('ore:runeAsgard')]
23-
])
24-
25-
mods.extendedcrafting.TableCrafting.addShaped(2, item("interaction:huge_le_infuser"), [
26-
[ore('plateDenseMystic'), ore('plateDenseSkyfather'), ore('rodBlitz'), ore('plateDenseSkyfather'), ore('plateDenseMystic')],
27-
[ore('plateDenseMystic'), ore('rodBlitz'), ore('plateDenseSkyfather'), ore('plateDenseSkyfather'), ore('plateDenseMystic')],
28-
[ore('plateDenseMystic'), ore('plateDenseSkyfather'), ore('rodBlitz'), ore('plateDenseSkyfather'), ore('plateDenseMystic')],
29-
[ore('plateDenseMystic'), ore('plateDenseSkyfather'), ore('plateDenseSkyfather'), ore('rodBlitz'), ore('plateDenseMystic')],
30-
[ore('plateDenseMystic'), ore('plateDenseSkyfather'), ore('rodBlitz'), ore('plateDenseSkyfather'), ore('plateDenseMystic')]
20+
[ore('runeAsgard'), item('botanicadds:pool_dreaming'), ore('runePrideB'), ore('runeSummerB'), item('botanicadds:rune_tp'), ore('runeGreedB'), ore('runeAutumnB'), item('botanicadds:pool_dreaming'), ore('runeAsgard')],
21+
[ore('runeAsgard'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), ore('runeAsgard')],
22+
[ore('runeAsgard'), ore('runeAsgard'), ore('runeAsgard'), ore('gearGaiasteel'), ore('gearGaiasteel'), ore('gearGaiasteel'), ore('runeAsgard'), ore('runeAsgard'), ore('runeAsgard')]
3123
])
3224
mods.extendedcrafting.TableCrafting.addShaped(3, item('extrautils2:passivegenerator',6), [
3325
[item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8)],
@@ -68,8 +60,18 @@ mods.extendedcrafting.TableCrafting.addShaped(4, item('lightningcraft:lightning_
6860
[item('lightningcraft:lightning_cell', 2), null, null, null, ore('blockElectricium'), null, null, null, item('lightningcraft:lightning_cell', 2)],
6961
[item('lightningcraft:lightning_cell', 2), null, null, ore('blockElectricium'), null, null, null, null, item('lightningcraft:lightning_cell', 2)],
7062
[item('lightningcraft:lightning_cell', 2), null, ore('blockElectricium'), ore('blockElectricium'), item('minecraft:command_block'), ore('blockElectricium'), ore('blockElectricium'), null, item('lightningcraft:lightning_cell', 2)],
71-
[item('lightningcraft:lightning_cell', 2), null, null, null, null, null, ore('blockElectricium'), null, item('lightningcraft:lightning_cell', 2)],
7263
[item('lightningcraft:lightning_cell', 2), null, null, null, null, ore('blockElectricium'), null, null, item('lightningcraft:lightning_cell', 2)],
7364
[item('lightningcraft:lightning_cell', 2), null, null, null, ore('blockElectricium'), null, null, null, item('lightningcraft:lightning_cell', 2)],
65+
[item('lightningcraft:lightning_cell', 2), null, null, ore('blockElectricium'), null, null, null, null, item('lightningcraft:lightning_cell', 2)],
7466
[item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2)]
67+
])
68+
69+
mods.extendedcrafting.TableCrafting.addShaped(3, item('mysticalagradditions:stuff', 69), [
70+
[null,ore('blockInsanium'), null, null, null, ore('blockInsanium'),null],
71+
[null,null, null, ore('blockInsanium'), null, null,null],
72+
[null,ore('blockInsanium'), null, ore('blockInsanium'), null, ore('blockInsanium'),null],
73+
[null,ore('blockInsanium'), ore('blockInsanium'), ore('essenceLumium'), ore('blockInsanium'), ore('blockInsanium'),null],
74+
[null,ore('blockInsanium'), ore('essenceLumium'), item('extendedcrafting:material', 13), ore('essenceLumium'), ore('blockInsanium'),null],
75+
[null,ore('blockInsanium'), ore('essenceLumium'), ore('essenceLumium'), ore('essenceLumium'), ore('blockInsanium'),null],
76+
[null,null, ore('blockInsanium'), ore('blockInsanium'), ore('blockInsanium'), null,null]
7577
])

‎resources/modularmachinery/blockstates/adv_coke_oven_controller.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"forge_marker": 1,
3+
"defaults": {
4+
"model": "modularmachinery:blockcontroller"
5+
},
6+
"variants": {
7+
"facing=north,formed=false": {
8+
"model": "modularmachinery:blockcontroller"
9+
},
10+
"facing=south,formed=false": {
11+
"model": "modularmachinery:blockcontroller",
12+
"y": 180
13+
},
14+
"facing=west,formed=false": {
15+
"model": "modularmachinery:blockcontroller",
16+
"y": 270
17+
},
18+
"facing=east,formed=false": {
19+
"model": "modularmachinery:blockcontroller",
20+
"y": 90
21+
},
22+
"facing=north,formed=true": {
23+
"model": "modularmachinery:blockcontroller"
24+
},
25+
"facing=south,formed=true": {
26+
"model": "modularmachinery:blockcontroller",
27+
"y": 180
28+
},
29+
"facing=west,formed=true": {
30+
"model": "modularmachinery:blockcontroller",
31+
"y": 270
32+
},
33+
"facing=east,formed=true": {
34+
"model": "modularmachinery:blockcontroller",
35+
"y": 90
36+
},
37+
"inventory": [
38+
{
39+
"transform": "forge:default-block"
40+
}
41+
]
42+
}
43+
}

‎scripts/recipes/mods/AT.zs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,6 @@ mods.extendedcrafting.TableCrafting.addShaped(2, <avaritia:neutron_collector>*2,
3434
mods.avaritia.ExtremeCrafting.remove(<avaritia:neutron_collector>);
3535

3636

37-
mods.avaritia.ExtremeCrafting.remove(<avaritia:resource:6>);
38-
39-
40-
mods.avaritia.ExtremeCrafting.addShaped("infinityingot", <avaritia:resource:6>, [
41-
[null, null, null, null, null, null, null, null, null],
42-
[<ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>],
43-
[<ore:ingotUltimate>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>, <ore:ingotUltimate>],
44-
[<ore:ingotUltimate>,<avaritia:resource:5>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>,<avaritia:resource:5>, <ore:ingotUltimate>],
45-
[<ore:ingotUltimate>,<avaritia:resource:5>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <avaritiatweaks:infinitato>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>,<avaritia:resource:5>, <ore:ingotUltimate>],
46-
[<ore:ingotUltimate>,<avaritia:resource:5>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>,<avaritia:resource:5>, <ore:ingotUltimate>],
47-
[<ore:ingotUltimate>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>, <ore:ingotUltimate>],
48-
[<ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>],
49-
[null, null, null, null, null, null, null, null, null]
50-
]);
51-
5237
//package
5338
RecipeUtils.recipeTweak(true, <packagedavaritia:extreme_crafter>, [[<avaritia:resource:1>, <packagedauto:me_package_component>, <avaritia:resource:1>], [<ore:dustRedstone>, <avaritiaddons:extreme_auto_crafter>, <ore:dustRedstone>], [<avaritia:resource:1>, <minecraft:hopper>, <avaritia:resource:1>]]);
5439
recipes.addShaped(<avaritiaddons:extreme_auto_crafter>, [[null, <avaritia:singularity:3>, null], [<ore:blockCosmicNeutronium>, <botania_tweaks:dire_crafty_crate>, <ore:blockCosmicNeutronium>], [null, <ore:blockCosmicNeutronium>, null]]);

‎scripts/recipes/mods/MA.zs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,5 @@ recipes.addShaped(<mysticalagriculture:supremium_leggings>, [[<mysticalagricultu
6565
recipes.addShaped(<mysticalagriculture:supremium_chestplate>, [[<mysticalagriculture:crafting:37>, <mysticalagriculture:gear:9>, <mysticalagriculture:crafting:37>],[<mysticalagriculture:crafting:37>, <deepmoblearning:glitch_infused_chestplate>, <mysticalagriculture:crafting:37>], [<mysticalagriculture:crafting:37>, <mysticalagriculture:crafting:37>, <mysticalagriculture:crafting:37>]]);
6666
recipes.addShaped(<mysticalagriculture:supremium_helmet>, [[<mysticalagriculture:crafting:37>, <mysticalagriculture:gear:9>, <mysticalagriculture:crafting:37>],[<mysticalagriculture:crafting:37>, <deepmoblearning:glitch_infused_helmet>, <mysticalagriculture:crafting:37>], [null, null, null]]);
6767

68+
//creative
69+
recipes.addShapeless(<mysticalagradditions:insanium>*4,[<mysticalagradditions:stuff:69>.reuse()]);

‎scripts/recipes/mods/NCO.zs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ recipes.remove(<nuclearcraft:part:12>);
3737
recipes.addShaped(<nuclearcraft:part>, [[<ore:dustGraphite>, <ore:ingotEezo>, null],[<ore:ingotEezo>, <immersiveengineering:material:18>, null], [null, null, null]]);
3838
recipes.addShaped(<nuclearcraft:part:4>, [[null, <taiga:palladium_ingot>, null],[<enderio:item_alloy_ingot>, <taiga:palladium_ingot>, <enderio:item_alloy_ingot>], [null, <taiga:palladium_ingot>, null]]);
3939
recipes.remove(<nuclearcraft:part:4> * 2);
40-
RecipeUtils.recipeTweak(true,<nuclearcraft:assembler>, [[<ore:plateElite>, <ore:ingotHardCarbon>, <ore:plateElite>], [<ore:actuator>, <ore:chassis>, <ore:actuator>], [<ore:plateElite>, <ore:motor>, <ore:plateElite>]]);
4140

4241
mods.extendedcrafting.TableCrafting.addShaped(2, <nuclearcraft:part:8>*2, [
4342
[null, null, <ore:ingotFerroboron>, <ore:ingotFerroboron>, null],
@@ -197,8 +196,7 @@ RecipeUtils.recipeTweak(true, <nuclearcraft:melter>, [[<ore:circuitOperation>, <
197196
RecipeUtils.recipeTweak(true, <nuclearcraft:pressurizer>, [[<ore:circuitOperation>, <ore:blockTough>, <ore:circuitOperation>], [<ore:gearAdvancedElectronicAlloy>, <ore:emptyFrame>, <ore:gearAdvancedElectronicAlloy>], [<ore:circuitOperation>, <ore:blockTough>, <ore:circuitOperation>]]);
198197
RecipeUtils.recipeTweak(true, <nuclearcraft:rock_crusher>, [[<ore:circuitOperation>, <ore:blockTough>, <ore:circuitOperation>], [<ore:ingotThaumiumTerra>, <ore:emptyFrame>, <ore:ingotThaumiumTerra>], [<ore:circuitOperation>, <ore:ingotTough>, <ore:circuitOperation>]]);
199198
RecipeUtils.recipeTweak(true, <nuclearcraft:ingot_former>, [[<ore:circuitThaumic>, <minecraft:hopper:*>, <ore:circuitThaumic>], [<ore:ingotFerroboron>, <ore:emptyFrame>, <ore:ingotFerroboron>], [<ore:circuitThaumic>, <ore:ingotTough>, <ore:circuitThaumic>]]);
200-
recipes.remove(<nuclearcraft:assembler>);
201-
recipes.addShaped(<nuclearcraft:assembler>, [[<ore:circuitOperation>, <ore:gearHardCarbon>, <ore:circuitOperation>], [<ore:plateFerroboron>, <ore:emptyFrame>, <ore:plateFerroboron>], [<ore:circuitOperation>, <ore:plateFerroboron>, <ore:circuitOperation>]]);
199+
RecipeUtils.recipeTweak(true, <nuclearcraft:assembler>, [[<ore:circuitOperation>, <ore:gearHardCarbon>, <ore:circuitOperation>], [<ore:plateFerroboron>, <ore:emptyFrame>, <ore:plateFerroboron>], [<ore:circuitOperation>, <ore:plateFerroboron>, <ore:circuitOperation>]]);
202200

203201
//taiga
204202
OreLeacher.addRecipe(<enderio:block_infinity:2>,<liquid:nitric_acid>*16, <liquid:hydrochloric_acid>*16, <liquid:sulfuric_acid>*16, <enderio:item_material:20>*64, <taiga:eezo_dust>*2, null);

0 commit comments

Comments
 (0)