index.toml

@@ -349,10 +349,6 @@ hash = "a4454cdbcbe9cc1f09125730bf3b513ecae2e14e2bdf4296e997a8bf767d6fb9"
 file = "kubejs/config/common.properties"
 hash = "f6bb8d377d9fc2085ebb06bbb4ebbd0f1786325ed821ec254064dbb8f2a94f80"
 
-[[files]]
-file = "kubejs/data/emi/recipe/defaults/kubejs.json"
-hash = "3dfbf52f29923ede5825329f240ef085339775fd9996df6cdc0e7fc835b11080"
-
 [[files]]
 file = "kubejs/data/industrialforegoing/recipes/dissolution_chamber/advanced_machine_frame.json"
 hash = "3222c9ad39285f3503cbbeae101f9b5f346c7a259d828e1e157f7c21d744d61b"
@@ -527,23 +523,23 @@ hash = "a5e02c71fd92029ea204f96d071c6b25f59d03b59f65199cb24f96a1858b3ed0"
 
 [[files]]
 file = "kubejs/server_scripts/grist/agricultural.js"
-hash = "a9f21524adfd569716db1d82b65fd784cd9995e02499e890b8538b7c00cfe0ba"
+hash = "cdf7287193272cb56683c68fd2a6e70ba9afc858e3a2cabafbdecdefddd37245"
 
 [[files]]
 file = "kubejs/server_scripts/grist/build.js"
-hash = "5e5aca71adcfd40449cf4470efd6c9bde43ccea542fcf603934b48277966454c"
+hash = "fb0b2aae3ef5e7c77eb03392f92c043a33df894e7e986cab4b045900d970fa81"
 
 [[files]]
 file = "kubejs/server_scripts/grist/energetic.js"
-hash = "b89a43e5216126b188a5771f9dd45bc43d9292c9bdc92cfb6de3108d09559afc"
+hash = "5ab83de41e89b9d25acfabb4d26bd6e53579f274c9e8e8abf738d8674b24feb3"
 
 [[files]]
 file = "kubejs/server_scripts/grist/intelligent.js"
-hash = "6ddf5213bf5e22c3a70deacfc4a063f11d325113da1d7060ef1017a746161067"
+hash = "f922fd6e0bba21f3bb42929d83b4c977178a8421a176adc8e738291c877a27d7"
 
 [[files]]
 file = "kubejs/server_scripts/grist/primordeal.js"
-hash = "32bede2b887371f13128bfde64655310117d9d0e460a84490db6a79ac6884207"
+hash = "b2558215fb1aca7efcf3a1c09d41e847f78e8fe61c3aa6652b17bd870edd8b87"
 
 [[files]]
 file = "kubejs/server_scripts/grist/tags.js"
@@ -551,7 +547,7 @@ hash = "f8c23be0553da9ec51e7f58e94d5b547e9ee813cea2a8c97d7cc5def3c680ddd"
 
 [[files]]
 file = "kubejs/server_scripts/init.js"
-hash = "d103c3bb61fe22aa1f4ab6d866b1b0d24c47c2aa55f74018eaf460702043a66e"
+hash = "359568a66f5354c5d9bd92e8743de6e6af35bfd26ffe3194df40466f2b6ce032"
 
 [[files]]
 file = "kubejs/server_scripts/malloc-balance.js"
@@ -561,10 +557,6 @@ hash = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 file = "kubejs/server_scripts/mods/ae2.js"
 hash = "4dacad5d914c02db31c80e40d7edab7fee89a817444e2f75858209278f9be446"
 
-[[files]]
-file = "kubejs/server_scripts/mods/apotheosis.js"
-hash = "815fc6329edd3a9445c7b6be55ecc83f1d4b98de5474d84a5316bc915dde8a46"
-
 [[files]]
 file = "kubejs/server_scripts/mods/arsnoveau.js"
 hash = "f25c7a0fd694135d3de66db51519c14377f96a836dbd59081a9f22860fb1878d"
@@ -595,11 +587,7 @@ hash = "4717847a6d54f56ed6919a1e2c3591fc73780973708e818a563753132bc7c15e"
 
 [[files]]
 file = "kubejs/server_scripts/mods/create.js"
-hash = "2989241678e27da372401bb66e10b412697b563b2fb8185a380dc3f62cefcd82"
+hash = "13831564cb218cf39d1db7d6891a1fc3f4647bdbe1b30a25571f863edecbf4de"
-
-[[files]]
-file = "kubejs/server_scripts/mods/create_new_age.js"
-hash = "06b10973ef4e2d9b053643a50d443a9e16134d46ba1dc8ed68b2f7b02b44cc7e"
 
 [[files]]
 file = "kubejs/server_scripts/mods/croptopia.js"
@@ -693,10 +681,6 @@ hash = "d37bfb9bc41aa46d0aa075dbe19a5eeb947b4ea3d8f13c03ac370cb00763d7a1"
 file = "kubejs/server_scripts/mods/thermal.js"
 hash = "b33f603a2121bc90e47b27680ee55655dca46c9d7b07d97d1c06698d0a1c762d"
 
-[[files]]
-file = "kubejs/server_scripts/mods/torchmaster.js"
-hash = "9eed24eaac1d6016fc1d99bcb7259900e430afd674db47c52df89e5cdb6e1317"
-
 [[files]]
 file = "kubejs/server_scripts/mods/vinery.js"
 hash = "208d9d49c612c84f57ee509ec02d4c44145b673caaa06fe451340dc30b8da5aa"
@@ -711,7 +695,7 @@ hash = "4003082f31011049402ff31504a6db0f4fdd6c7076167109c66fa412286be462"
 
 [[files]]
 file = "kubejs/server_scripts/ore-processing.js"
-hash = "91fa17715970df4915964399d005ecea30247e6f891234e077984b2004a53d21"
+hash = "b5317b5c9094cf38ef9ffb536a70ebf849056030a900feb4a837b284ec4c7f1c"
 
 [[files]]
 file = "kubejs/server_scripts/progression/report.js"
@@ -1000,11 +984,6 @@ file = "mods/cooking-for-blockheads.pw.toml"
 hash = "4df05f5b4ffd71d44d4a9d2572548b5fa34103e88c151cb7ed0cddb662eb677e"
 metafile = true
 
-[[files]]
-file = "mods/copycats.pw.toml"
-hash = "35547f679eb0eeac8c5158e49faea3b4ba99263bd6fd1cd27114a48dd6d3db9d"
-metafile = true
-
 [[files]]
 file = "mods/corn-delight.pw.toml"
 hash = "e5436d140858377db41e50dbc6ef5ea6fc8efecdbedbb56ae6bf25ac6b4de57e"
@@ -1220,11 +1199,6 @@ file = "mods/exposure.pw.toml"
 hash = "4835b66cd4c26a027d52b4d15916f010c326537bebaa81350ddd40b9df61cf27"
 metafile = true
 
-[[files]]
-file = "mods/fairy-lights.pw.toml"
-hash = "eeca094798607a0393a5ec261a0f3298e20fa74b0daa879951aec47c2c7fe64b"
-metafile = true
-
 [[files]]
 file = "mods/farmers-delight.pw.toml"
 hash = "ba6c13e70f06dde3b8d01d4143c22fea36ec035d7cd8834c7a82aa778a809467"
@@ -1540,11 +1514,6 @@ file = "mods/lootr.pw.toml"
 hash = "a3fc2800be76f3406961d01ab4ab6805b4ca5e269f53d3cb2d58ea39d6afa9f2"
 metafile = true
 
-[[files]]
-file = "mods/macaws-lights-and-lamps.pw.toml"
-hash = "a205d0ab764efa4bb2eb93c114bbfde4cd3e117d117be9a941b8b56148945d0a"
-metafile = true
-
 [[files]]
 file = "mods/magnesium-extras.pw.toml"
 hash = "27f69e040bd3275a1ee455353f1ad31b69200d72122308ead260522a6c2525e0"
@@ -1795,11 +1764,6 @@ file = "mods/simple-voice-chat.pw.toml"
 hash = "703a46fa7d4918e855cc6ee841d4542741494851023ff49ba4087092a8d70b20"
 metafile = true
 
-[[files]]
-file = "mods/simply-light.pw.toml"
-hash = "762eced5d260cdbc94f0acc033efd8fe70fdfe5a28bd8d180e0b052de509893f"
-metafile = true
-
 [[files]]
 file = "mods/simply-swords.pw.toml"
 hash = "60fffd9990be454a9dffb87a2804f654e6deb21b2ee63924ef4a84d443612352"

kubejs/data/emi/recipe/defaults/kubejs.json

@@ -1,49 +0,0 @@
-{
-    "added": [
-      "jei:/farmersdelight/kjs/7xq4nyk3r5vfi4o5stor2qno",
-      "jei:/thermal/kjs/4umrea9hazjwtxvpwevqoae8e",
-      "ae2:network/cells/item_storage_components_cell_16k_part",
-      "ae2:network/cells/item_storage_components_cell_1k_part",
-      "minecraft:kjs/grist_intelligent_basic",
-      "jei:/summoningrituals/kjs/3fs6aw230b71bmm7kysg4doxm",
-      "jei:/thermal/kjs/5q4y5rpbrx8e376dyfxh882m2",
-      "ae2:network/blocks/storage_chest",
-      "kubejs:grist_primordeal_improved_manual_only",
-      "jei:/caupona/kjs/45zxnyunup7lwby0s5u010k2m",
-      "minecraft:kjs/insightful_tincture",
-      "powah:kjs/3f73f2rnxi6tyutjjhrcpmrv2",
-      "kubejs:grist_primordeal_basic_manual_only",
-      "jei:/farmersdelight/kjs/4z9mtrr3eq6xwnjucb5onkj9m",
-      "jei:/ae2/inscriber/calculation_processor",
-      "jei:/ae2/inscriber/logic_processor",
-      "minecraft:kjs/grist_energetic_basic_block_2",
-      "jei:/create/kjs/ep7so3n829sq63hg3pi28l0yy",
-      "jei:/create/kjs/akwrfa3jl0aw5t0z03ht8llmg",
-      "cookingforblockheads:toaster",
-      "jei:/create/kjs/86gof05gy2luf5i6d12ui1cjb",
-      "ae2:network/cables/glass_fluix",
-      "minecraft:kjs/grist_energetic_basic",
-      "minecraft:kjs/grist_paste",
-      "minecraft:kjs/grist_build_basic_2",
-      "jei:/industrialforegoing/kjs/5pxdlk276ldctac2uef99tfs1",
-      "minecraft:kjs/grist_agricultural_basic",
-      "jei:/farmersdelight/kjs/9peruvnu0lsi6d079cjh6seyc",
-      "appliedcooking:kitchen_station",
-      "ae2:smelting/silicon_from_certus_quartz_dust",
-      "jei:/ae2/inscriber/engineering_processor",
-      "jei:/ars_nouveau/kjs/3fs313200k49rtji8uufmacsq",
-      "ae2:network/cells/item_storage_components_cell_4k_part",
-      "jei:/thermal/kjs/cbe32crqpdzagvuhkf6vilvjb",
-      "jei:/thermal/kjs/70qk6590scuax6epa980053cl",
-      "jei:/create/kjs/dwn1xyh6m7yc44b4xpx827n2",
-      "minecraft:redstone",
-      "minecraft:kjs/insightful_blend",
-      "minecraft:kjs/sacred_flesh",
-      "jei:/apotheosis/kjs/e5z0qepnnqf0wr4f65tjc3xqq",
-      "jei:/thermal/kjs/8qo66bnz9m6cpy1okhsev4db2",
-      "minecraft:kjs/grist_treats",
-      "powah:kjs/5otj39ftzbmi5k8gw3rqw2i9q",
-      "ae2:network/parts/terminals",
-      "minecraft:kjs/grist_primordeal_basic_block"
-    ]
-}

kubejs/server_scripts/grist/agricultural.js

@@ -33,7 +33,7 @@ ServerEvents.recipes(event => {
             {tag: 'forge:dough'},
             {item: 'minecraft:gunpowder'}
         ],
-        result: {item: 'kubejs:grist_agricultural_basic_block', count: 1}
+        result: {item: 'kubejs:grist_agricultural_basic', count: 16}
     });
     event.custom({
         type: 'farmersdelight:cooking',
@@ -45,7 +45,7 @@ ServerEvents.recipes(event => {
             {tag: 'forge:dough'},
             {item: 'minecraft:gunpowder'}
         ],
-        result: {item: 'kubejs:grist_agricultural_basic_block', count: 1}
+        result: {item: 'kubejs:grist_agricultural_basic', count: 2}
     });
 
     /*
@@ -118,7 +118,7 @@ ServerEvents.recipes(event => {
             {item: 'candlelight:pasta_bolognese'},
             {item: 'collectorsreap:prawn_po_boy'},
         ],
-        inputFluid: "{Amount:5000,FluidName:\"kubejs:grist_agricultural_improved_fluid\"}",
+        inputFluid: "{Amount:5000,FluidName:\"kubejs:grist_agricultural_basic_fluid\"}",
         output: {
             count: 1,
             item: 'kubejs:grist_morsels'

kubejs/server_scripts/grist/build.js

@@ -21,7 +21,7 @@ ServerEvents.recipes(event => {
     Instead of an ore hammer, you can use a heated mixer with create
     */
     event.recipes.thermal.smelter(
-        'kubejs:grist_build_basic_block',
+        '2x kubejs:grist_build_basic',
         ['#kubejs:grist/build/basic', 'kubejs:grist_primordeal_basic_block']
     );
     event.custom({
@@ -32,10 +32,18 @@ ServerEvents.recipes(event => {
         ],
         heatRequirement: "heated",
         results: [
-            'kubejs:grist_build_basic_block'
+            '2x kubejs:grist_build_basic'
         ]
     });
     event.smelting('16x kubejs:grist_build_basic', 'kubejs:refined_grist_aggregate');
+    event.recipes.shapeless(
+        'kubejs:coarse_grist_aggregate', [
+        '3x #forge:sand',
+        'minecraft:clay_ball',
+        '3x #forge:gravel',
+        '#alltheores:ore_hammers',
+        'kubejs:grist_primordeal_basic_block'
+    ]).id('kubejs:coarse_grist_aggregate_manual_only');
     event.custom({
         type: 'create:mixing',
         ingredients: [
@@ -49,6 +57,13 @@ ServerEvents.recipes(event => {
             'kubejs:coarse_grist_aggregate'
         ]
     });
+    event.recipes.shapeless(
+        'kubejs:reduced_grist_aggregate', [
+        '#alltheores:ore_hammers',
+        'minecraft:granite',
+        'kubejs:grist_primordeal_basic',
+        '6x kubejs:coarse_grist_aggregate'
+    ]).id('kubejs:reduced_grist_aggregate_manual_only');
     event.custom({
         type: 'create:mixing',
         ingredients: [
@@ -61,6 +76,12 @@ ServerEvents.recipes(event => {
             'kubejs:reduced_grist_aggregate'
         ]
     });
+    event.recipes.shapeless(
+        '2x kubejs:refined_grist_aggregate', [
+        '#alltheores:ore_hammers',
+        'kubejs:grist_primordeal_basic',
+        '5x kubejs:reduced_grist_aggregate'
+    ]).id('kubejs:refined_grist_aggregate_manual_only');
     event.custom(
         {
             type: 'create:mixing',

kubejs/server_scripts/grist/energetic.js

@@ -26,7 +26,7 @@ ServerEvents.recipes(event => {
     your first energetic comes from smelting grist paste
     grist paste comes from redstone, obsidian, and primordeal grist
     */
-    event.smelting('2x kubejs:grist_energetic_basic_block', 'kubejs:grist_paste');
+    event.smelting('16x kubejs:grist_energetic_basic', 'kubejs:grist_paste');
     event.shaped('2x kubejs:grist_paste', [
         'ADA',
         'BCB',
@@ -39,7 +39,7 @@ ServerEvents.recipes(event => {
     });
     event.recipes.powah.energizing(
         ['kubejs:grist_primordeal_basic_block', '#kubejs:grist/energetic/basic'],
-        'kubejs:grist_energetic_basic_block',
+        '2x kubejs:grist_energetic_basic',
         3000
     );
 

kubejs/server_scripts/grist/intelligent.js

@@ -32,7 +32,7 @@ ServerEvents.recipes(event => {
             quanta: 25,
             arcana: -1
         },
-        result: Item.of('kubejs:grist_intelligent_basic_block', 2).toJson()
+        result: Item.of('kubejs:grist_intelligent_basic', 16).toJson()
     });
 
     event.shaped('kubejs:sacred_flesh', [
@@ -71,7 +71,7 @@ ServerEvents.recipes(event => {
 
     event.recipes.ars_nouveau.imbuement(
         'kubejs:grist_primordeal_basic_block',
-        'kubejs:grist_intelligent_basic_block',
+        'kubejs:grist_intelligent_basic',
         900,
         ['kubejs:grist_intelligent_basic']
     );

kubejs/server_scripts/grist/primordeal.js

@@ -26,7 +26,7 @@ ServerEvents.recipes(event => {
     ], {
         'A': '#forge:cobblestone',
         'B': 'kubejs:grist_essence'
-    }).id('kubejs:grist_primordeal_basic_block_essence_manual_only');
+    }).id('kubejs:grist_primordeal_basic_block_manual_only');
     event.custom({
         type: 'create:mixing',
         ingredients: [

kubejs/server_scripts/init.js

@@ -25,10 +25,6 @@ global.ingotItem = (material, qty) => {
     return global.metalForm(material, 'ingots', 'ingot', qty);
 }
 
-global.plateItem = (material, qty) => {
-    return global.metalForm(material, 'plates', 'plate', qty);
-}
-
 global.gearItem = (material, qty) => {
     return global.metalForm(material, 'gears', 'gear', qty);
 }

kubejs/server_scripts/mods/apotheosis.js

@@ -1,26 +0,0 @@
-ServerEvents.recipes(event => {
-    event.replaceInput({output: 'apotheosis:ender_lead'},
-        'minecraft:ender_pearl',
-        '#kubejs:grist/intelligent/basic'
-    );
-
-    event.replaceInput({output: 'apotheosis:ender_lead'},
-        'minecraft:gold_ingot',
-        '#kubejs:grist/agricultural/basic'
-    );
-
-    event.replaceInput({output: 'apotheosis:salvaging_table'},
-        'minecraft:copper_ingot',
-        '#forge:ingots/steel'
-    );
-
-    event.replaceInput({output: 'apotheosis:salvaging_table'},
-        'minecraft:iron_pickaxe',
-        '#kubejs:grist/intelligent/basic'
-    );
-
-    event.replaceInput({output: 'apotheosis:salvaging_table'},
-        'minecraft:iron_axe',
-        '#kubejs:grist/intelligent/basic'
-    );
-});

kubejs/server_scripts/mods/create.js

@@ -1,5 +1,17 @@
 
 ServerEvents.recipes(event => {
+    // Gate create behind finding tin and basic ore crushing hammers
+    event.remove({output: 'create:andesite_alloy'});
+    event.shapeless('2x create:andesite_alloy', [
+        '2x minecraft:andesite',
+        global.dustItem('tin', 2),
+    ]);
+
+    event.recipes.thermal.smelter(
+        '6x create:andesite_alloy',
+        ['2x minecraft:andesite', '#forge:dusts/tin']
+    );
+
     event.shapeless('2x create:cogwheel', [
         'thermal:tin_gear',
         '#minecraft:planks',
@@ -28,29 +40,6 @@ ServerEvents.recipes(event => {
         '#forge:plates/invar'
     );
 
-    event.remove({output: 'create:windmill_bearing'});
-    event.shaped('create:windmill_bearing', [
-        ' A ',
-        'DBD',
-        'DCD'
-    ], {
-        'A': '#minecraft:wooden_slabs',
-        'B': '#forge:stone',
-        'C': 'create:shaft',
-        'D': '#kubejs:grist/energetic/basic'
-    });
-
-    // Gate the backpack behind mid-game energetic grist
-    event.replaceInput({output: 'create:copper_backtank'},
-        'minecraft:copper_block',
-        'kubejs:grist_energetic_basic_block'
-    )
-
-    event.replaceInput({output: 'create:schematicannon'},
-        'minecraft:iron_block',
-        'kubejs:grist_build_basic_block'
-    )
-
     // Allow certus quartz to be used for rose quartz
     event.replaceInput({output: 'create:rose_quartz'},
         'minecraft:quartz',
@@ -61,8 +50,7 @@ ServerEvents.recipes(event => {
         '8x minecraft:redstone',
     ]);
     
-    // Crushing wheels can come from build grist
+    // Crushing wheels can either come from finding diamonds (expensive) or build grist (cheap, eventually)
-    event.remove({output: 'create:crushing_wheel'});
     event.shaped('create:crushing_wheel', [
         'CBC',
         'BAB',
@@ -73,6 +61,16 @@ ServerEvents.recipes(event => {
         'C': 'create:andesite_alloy',
     });
 
+    event.shaped('create:crushing_wheel', [
+        'CBC',
+        'BAB',
+        'CBC'
+    ], {
+        'A': 'minecraft:diamond',
+        'B': 'thermal:tin_gear',
+        'C': 'create:andesite_alloy',
+    });
+
     // Melt down XP nuggets and blocks into raw XP
     // 1 nugget == 60mb cognitium
     event.recipes.createMixing(Fluid.of('experienceobelisk:cognitium', 60), 'create:experience_nugget').heated();
@@ -86,21 +84,4 @@ ServerEvents.recipes(event => {
         event.recipes.createDeploying('create:incomplete_precision_mechanism', ['create:incomplete_precision_mechanism', 'create:cogwheel']),
         event.recipes.createDeploying('create:incomplete_precision_mechanism', ['create:incomplete_precision_mechanism', '#forge:gears/copper'])
     ]).transitionalItem('create:incomplete_precision_mechanism').loops(3);
-
-    // Factory automation should require some intelligent grist
-    event.replaceInput({output: 'create:stock_ticker'},
-        'minecraft:gold_ingot',
-        '#kubejs:grist/intelligent/basic'
-    );
-
-    event.remove({output: 'create:stock_link'});
-    event.shaped('create:stock_link', [
-        ' A ',
-        ' B ',
-        ' C '
-    ], {
-        'A': 'create:transmitter',
-        'B': 'create:item_vault',
-        'C': '#kubejs:grist/intelligent/basic',
-    });
 });

kubejs/server_scripts/mods/create_new_age.js

@@ -1,128 +0,0 @@
-ServerEvents.recipes(event => {
-    // Most of the mod is gated behind basic energetic and build grist
-    event.replaceInput({output: 'create_new_age:reinforced_motor'},
-        'minecraft:diamond',
-        '#kubejs:grist/build/basic'
-    );
-
-    event.replaceInput({mod: 'create_new_age'},
-        'minecraft:redstone_block',
-        '#kubejs:grist/energetic/basic'
-    );
-
-
-    event.replaceInput({mod: 'create_new_age'},
-        'minecraft:netherite_scrap',
-        '#kubejs:grist/energetic/improved'
-    );
-
-    event.replaceInput({mod: 'create_new_age'},
-        '#forge:nuggets/copper',
-        '#kubejs:grist/energetic/basic'
-    );
-
-    // Reactor requires energetic
-    event.replaceInput({output: 'create_new_age:reactor_casing'},
-        'minecraft:bricks',
-        '#kubejs:grist/energetic/improved'
-    );
-
-    // Power generation requires basic energetic and build
-    event.replaceInput({output: 'create_new_age:carbon_brushes'},
-        'minecraft:coal',
-        '#kubejs:grist/build/basic'
-    );
-
-    event.replaceInput({output: 'create_new_age:generator_coil'},
-        'minecraft:copper_ingot',
-        '#kubejs:grist/energetic/basic'
-    );
-
-    // Rewrite the motors to use grist
-    event.remove({output: 'create_new_age:basic_motor'});
-    event.shaped('create_new_age:basic_motor', [
-        'ABA',
-        'CDE',
-        'AFA'
-    ], {
-        'A': '#forge:nuggets/iron',
-        'B': '#kubejs:grist/energetic/basic',
-        'C': 'create_new_age:magnetite_block',
-        'D': 'create:andesite_casing',
-        'E': 'create:shaft',
-        'F': '#kubejs:grist/build/basic'
-    });
-
-    event.remove({output: 'create_new_age:advanced_motor'});
-    event.shaped('create_new_age:advanced_motor', [
-        'ABA',
-        'CDE',
-        'AFA'
-    ], {
-        'A': '#forge:plates/invar',
-        'B': '#kubejs:grist/energetic/basic',
-        'C': global.ingotItem('tin'),
-        'D': 'create:andesite_casing',
-        'E': 'create:shaft',
-        'F': '#kubejs:grist/build/basic'
-    });
-
-
-    // Powah compat with the energizing recipes
-
-    /*event.recipes.powah.energizing(
-        ['#forge:plates/iron'],
-        'create_new_age:overcharged_iron_sheet',
-        1000
-    );
-
-    event.recipes.powah.energizing(
-        ['#forge:ingots/iron'],
-        'create_new_age:overcharged_iron',
-        2000
-    );
-
-    event.recipes.powah.energizing(
-        ['#forge:ingots/gold'],
-        'create_new_age:overcharged_gold',
-        2000
-    );
-
-    event.recipes.powah.energizing(
-        ['#forge:plates/gold'],
-        'create_new_age:overcharged_gold_sheet',
-        2000
-    );*/
-
-    // Remove the whole energizing mechanic in favor of the metals system
-    event.remove({type: 'create_new_age:energising'});
-    event.remove({output: 'create_new_age:overcharged_iron_sheet'});
-    event.remove({output: 'create_new_age:overcharged_gold_sheet'});
-    event.remove({output: 'create_new_age:energiser_t1'});
-    event.remove({output: 'create_new_age:energiser_t2'});
-    event.remove({output: 'create_new_age:energiser_t3'});
-    event.replaceInput({},
-        'create_new_age:overcharged_iron',
-        global.ingotItem('tin')
-    );
-
-    event.replaceInput({},
-        'create_new_age:overcharged_iron_sheet',
-        global.plateItem('tin')
-    );
-    
-    event.replaceInput({},
-        'create_new_age:overcharged_gold',
-        global.ingotItem('constantan')
-    );
-
-    event.replaceInput({},
-        'create_new_age:overcharged_gold_sheet',
-        global.plateItem('constantan')
-    );
-
-    event.replaceInput({},
-        'create_new_age:overcharged_diamond',
-        global.gearItem('platinum')
-    );
-});

kubejs/server_scripts/mods/torchmaster.js

@@ -1,19 +0,0 @@
-ServerEvents.recipes(event => {
-    event.replaceInput({mod: 'torchmaster'},
-        'minecraft:diamond',
-        '#kubejs:grist/intelligent/improved'
-    );
-    event.replaceInput({mod: 'torchmaster'},
-        'minecraft:glowstone_dust',
-        '#kubejs:grist/intelligent/basic'
-    );
-    event.replaceInput({mod: 'torchmaster'},
-        'minecraft:gold_ingot',
-        '#kubejs:grist/build/basic'
-    );
-
-    event.replaceInput({mod: 'torchmaster'},
-        'minecraft:glowstone',
-        'torchmaster:megatorch'
-    );
-});

kubejs/server_scripts/ore-processing.js

@@ -129,13 +129,13 @@ ServerEvents.recipes(event => {
 		// Modern age: Alloys require improved grist
 		modern: {
 			gobber: [3, 'gobber2:gobber2_glob', 'platinum', 'osmium'],
-			nether_gobber: [3, 'gobber2:gobber2_glob_nether', 'minecraft:netherite_scrap', '2x gobber2:gobber2_ingot'],
+			nether_gobber: [3, 'gobber2:gobber2_glob_nether', 'minecraft:netherite_scrap', '2x gobber'],
 			quadrilium: [3, '3x trilium', '4x minecraft:netherite_scrap', 'powder_power:powder_ghast_tear']
 		},
 		// Age of Legends: The end game
 		legends: {
 			//enderium: [],
-			end_gobber: [3, 'gobber2:gobber2_glob_end', '2x gobber2:gobber2_ingot_nether', '2x #kubejs:grist/build/improved']
+			end_gobber: [3, 'gobber2:gobber2_glob_end', '2x nether_gobber', '2x #kubejs:grist/build/improved']
 		}
 	};
 
@@ -275,7 +275,7 @@ ServerEvents.recipes(event => {
 				event.recipes.create.deploying([dustType], [rawType, '#alltheores:ore_hammers']).keepHeldItem();
 				event.recipes.create.deploying([dustType.withCount(9)], [rawBlockType, '#alltheores:ore_hammers']).keepHeldItem();
 			} else {
-				console.warn(`No ${metal} ore hammer smashing available!`);
+				console.error(`No ${metal} ore hammer smashing available!`);
 			}
 
 			// TODO: alloy ingredients
@@ -299,7 +299,7 @@ ServerEvents.recipes(event => {
 					}
 				}
 
-				if (real_ingredients.length > 0 && ingotType.id != 'minecraft:air') {
+				if (real_ingredients.length > 0) {
 					event.shapeless(ingotType.withCount(ingredients[0]), real_ingredients);
 				}
 			}
@@ -349,13 +349,13 @@ ServerEvents.recipes(event => {
 					'B': '#forge:gems'
 				});
 			} else {
-				console.warn(`No ${metal} gears available!`);
+				console.error(`No ${metal} gears available!`);
 			}
 
 			if (plateType.id != 'minecraft:air') {
 				event.shapeless(plateType, [ingotType.withCount(2), '#alltheores:ore_hammers']);
 			} else {
-				console.warn(`No ${metal} plates available!`);
+				console.error(`No ${metal} plates available!`);
 			}
 
 			// TODO: alloy ingredients

mods/copycats.pw.toml

@@ -1,13 +0,0 @@
-name = "Create: Copycats+"
-filename = "copycats-3.0.0+mc.1.20.1-forge.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/UT2M39wf/versions/u3FzFq67/copycats-3.0.0%2Bmc.1.20.1-forge.jar"
-hash-format = "sha512"
-hash = "fbe3273c7288e52ed0d506509ae2113197580270ae229c60910c6d197d99317ab0f3273fffd4dd47816996142f7ad3b36085bd0f6adbe1c0a0bd688db0d1017e"
-
-[update]
-[update.modrinth]
-mod-id = "UT2M39wf"
-version = "u3FzFq67"

mods/fairy-lights.pw.toml

@@ -1,13 +0,0 @@
-name = "Fairy Lights"
-filename = "fairylights-7.0.0-1.20.1.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "7b392b908492be1dbfc84b72ae6445db8bb891dd"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 4961775
-project-id = 233342

mods/macaws-lights-and-lamps.pw.toml

@@ -1,13 +0,0 @@
-name = "Macaw's Lights and Lamps"
-filename = "mcw-lights-1.1.2-mc1.20.1forge.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/w4an97C2/versions/gqevfDHf/mcw-lights-1.1.2-mc1.20.1forge.jar"
-hash-format = "sha512"
-hash = "2ee82b5ca8d964cff83ea41d38bfa5e4c9a9bedb7bccf891ce269d25238bfeb3f46b428a4d6ff6695a69907046cec22b356f3feefe94564bfa4cc081df8fcb72"
-
-[update]
-[update.modrinth]
-mod-id = "w4an97C2"
-version = "gqevfDHf"

mods/simply-light.pw.toml

@@ -1,13 +0,0 @@
-name = "Simply Light"
-filename = "simplylight-1.20.1-1.4.6-build.50.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "cfd851ffd2c3b451a96a19207dc6e084c1dfec73"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 4832944
-project-id = 300331

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "6e2215e8b4c1118e99b690da421a2b13b5924ebdb76bf7bec63d90719a6fbf55"
+hash = "da6d6ea43ae7fdd0b7e245cb66db652a6c1bd2e2fcb9aa6a919bee9176729a85"
 
 [versions]
 forge = "47.4.0"