Merge pull request #3100 from AllTheMods/Staging

Release 1.8.26

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -26,6 +26,7 @@ body:
       label: Modpack Version
       description: What version of the pack are you using?
       options:
+        - 1.8.26
         - 1.8.25
         - 1.8.24
         - 1.8.23

.github/ISSUE_TEMPLATE/crash.yaml

@@ -25,6 +25,7 @@ body:
       label: Modpack Version
       description: What version of the pack are you using?
       options:
+        - 1.8.26
         - 1.8.25
         - 1.8.24
         - 1.8.23

changelog/1.8.26.md

@@ -0,0 +1,5 @@
+## Release 1.8.26
+
+### Other Changes
+- Fix Mekanism alloy recipes accidentally removed in the last update
+- Disable Quark buttons in AE2 terminals

config/allthetweaks-common.toml

@@ -8,4 +8,4 @@
 [packversionmin]
 	minor = 8
 [packversionminrev]
-	minorrev = 25
+	minorrev = 26

config/quark-common.toml

@@ -1,6 +1,6 @@
 [general]
 	"Enable 'q' Button" = false
-	"Ignored Screens" = ["blusunrize.immersiveengineering.client.gui.CraftingTableScreen", "com.tfar.craftingstation.client.CraftingStationScreen", "com.refinedmods.refinedstorage.screen.grid.GridScreen", "appeng.client.gui.implementations.CraftingTermScreen", "appeng.client.gui.implementations.PatternTermScreen", "com.blakebr0.extendedcrafting.client.screen.EliteTableScreen", "com.blakebr0.extendedcrafting.client.screen.EliteAutoTableScreen", "com.blakebr0.extendedcrafting.client.screen.UltimateTableScreen", "com.blakebr0.extendedcrafting.client.screen.UltimateAutoTableScreen", "me.desht.modularrouters.client.gui.filter.GuiFilterScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.CentrifugeScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.MechanicalCentrifugeScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.CentrifugeMultiblockScreen", "com.refinedmods.refinedstorage.screen.FilterScreen", "appeng.client.gui.me.items.CraftingTermScreen", "appeng.client.gui.me.items.PatternTermScreen", "com.YTrollman.CreativeCrafter.gui.CreativeCrafterScreen", "slimeknights.tconstruct.smeltery.client.inventory.HeatingStructureScreen", "slimeknights.tconstruct.smeltery.client.inventory.module.HeatingStructureSideInventoryScreen", "com.YTrollman.CreativeApiary.gui.CreativeApiaryStorageScreen"]
+	"Ignored Screens" = ["blusunrize.immersiveengineering.client.gui.CraftingTableScreen", "com.tfar.craftingstation.client.CraftingStationScreen", "com.refinedmods.refinedstorage.screen.grid.GridScreen", "appeng.client.gui.implementations.SecurityStationScreen", "appeng.client.gui.implementations.CraftingTermScreen", "appeng.client.gui.implementations.PatternTermScreen", "com.blakebr0.extendedcrafting.client.screen.EliteTableScreen", "com.blakebr0.extendedcrafting.client.screen.EliteAutoTableScreen", "com.blakebr0.extendedcrafting.client.screen.UltimateTableScreen", "com.blakebr0.extendedcrafting.client.screen.UltimateAutoTableScreen", "me.desht.modularrouters.client.gui.filter.GuiFilterScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.CentrifugeScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.MechanicalCentrifugeScreen", "com.resourcefulbees.resourcefulbees.client.gui.screen.CentrifugeMultiblockScreen", "com.refinedmods.refinedstorage.screen.FilterScreen", "appeng.client.gui.me.items.ItemTerminalScreen", "appeng.client.gui.me.items.CraftingTermScreen", "appeng.client.gui.me.items.PatternTermScreen", "com.YTrollman.CreativeCrafter.gui.CreativeCrafterScreen", "slimeknights.tconstruct.smeltery.client.inventory.HeatingStructureScreen", "slimeknights.tconstruct.smeltery.client.inventory.module.HeatingStructureSideInventoryScreen", "com.YTrollman.CreativeApiary.gui.CreativeApiaryStorageScreen"]
 	#Quark replaces the Piston logic to allow for its piston features to work. If you're having troubles, try turning this off.
 	"Use Piston Logic Replacement" = false
 [categories]

kubejs/server_scripts/mod_specific/immersive_engineering/immersive_engineering.js

@@ -71,14 +71,17 @@ onEvent('recipes', e => {
   })
 
   removeRecipeByID(e, [
+    'immersiveengineering:crafting/ingot_steel_from_dust_from_blasting',
+    'immersiveengineering:crafting/ingot_steel_from_dust',
     /^immersiveengineering:crafting\/ingot_.*_to_storage_.*/,
     'immersivepetroleum:hydrotreater/sulfur_recovery',
     'immersiveengineering:crusher/nether_wart',
     'immersiveengineering:crafting/concrete2',
     'engineerstools:crushing/aluminium_grit_crushing_recipe',
     'engineersdecor:dependent/slag_brick_block_recipe',
     'immersiveengineering:crafting/paper_from_sawdust',
-    'immersivepetroleum:distillationtower/oilcracking'
+    'immersivepetroleum:distillationtower/oilcracking',
+    'immersivepetroleum:arcfurnace/steel',
   ])
 
   removeRecipeByOutput(e, [

kubejs/server_scripts/mod_specific/mekanism/mekanism.js

@@ -84,7 +84,7 @@ onEvent('recipes', e => {
     e.remove({id: `mekanism:processing/${metal}/slurry/clean`})
   })
 
-  mekanismMetals.concat(mekanismAlloys).forEach(metal => {
+  mekanismMetals.concat(['bronze']).forEach(metal => {
     e.remove({id: `mekanism:processing/${metal}/dust/from_ingot`})
     e.remove({id: `mekanism:processing/${metal}/ingot/from_block`})
     e.remove({id: `mekanism:processing/${metal}/ingot/from_dust_blasting`})
@@ -96,6 +96,7 @@ onEvent('recipes', e => {
   })
 
   removeRecipeByID(e, [
+    'mekanism:nuggets/bronze',
     'mekanism:digital_miner',
     'mekanism:atomic_disassembler',
     'mekanism:mekasuit_helmet',