Merge pull request #2710 from AllTheMods/Staging

Staging

.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.10
         - 1.8.9
         - 1.8.8
         - 1.8.7

.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.10
         - 1.8.9
         - 1.8.8
         - 1.8.7

config/allthetweaks-common.toml

@@ -8,4 +8,4 @@
 [packversionmin]
 	minor = 8
 [packversionminrev]
-	minorrev = 9
+	minorrev = 10

kubejs/client_scripts/jei_removals.js

@@ -130,7 +130,8 @@ onEvent('jei.hide.items', e => {
     'zycraft:aluminium_foil',
     'zycraft:quartz_bucket',
     'zycraft:aluminium_can',
-    'compactmachines:tunnel'
+    'compactmachines:tunnel',
+    'projectred-core:copper_ingot'
   ])
 
   enviroStonesMats.forEach(stone => e.hide(`/enviromats:${stone}_.*/`))

kubejs/client_scripts/tooltips.js

@@ -56,8 +56,8 @@ onEvent('item.tooltip', e => {
   formattedTooltip('zycraft:zychorium_ice', 'Turns adjacent water to ice.')
   formattedTooltip('zycraft:fabricator', 'Autocrafter that can push the results into adjacent fabricators.')
   formattedTooltip('mekanism:creative_energy_cube', 'Will delete energy if not filled! Check JEI Info tab for more info on charging the cube')
-  formattedTooltip('mahoutsukai:caliburn', 'This item is obtained by throwing an enchanted sword into a lake created by the Power Consolidation ritual. The damage cap can be increased by throwing the sword back into the lake with an ATM Star')
-  formattedTooltip('mahoutsukai:morgan', 'This item is obtained by killing a tamed wolf with a Caliburn. The damage cap can be increased by throwing the sword back into the lake with an ATM Star')
+  formattedTooltip('mahoutsukai:caliburn', 'This item is obtained by throwing an enchanted sword into a lake created by the Power Consolidation ritual. The damage cap can be increased by throwing the sword back into the lake with up to five ATM Stars. This can only be done once.')
+  formattedTooltip('mahoutsukai:morgan', 'This item is obtained by killing a tamed wolf with a Caliburn. The damage cap will be the same as the Caliburn used to create it.')
   formattedTooltip('craftingstation:crafting_station', 'Crafting Station Mk.II')
   formattedTooltip('atmadditions:atm_star_shard', 'Check JEI Info page for more info')
   formattedTooltip('appliedenergistics2:quantum_entangled_singularity', 'To make this, you must use Ender Pearls, not Ender Dust')

kubejs/server_scripts/mod_specific/iceandfire/iceandfire.js

@@ -1,17 +1,32 @@
 onEvent('recipes', e => {
-  let dragonColors = ['red', 'green', 'bronze', 'gray', 'blue', 'white', 'sapphire', 'silver', 'electric', 'amythest', 'copper', 'black']
+  function dragonFlowers(dragons) {
+    dragons.forEach(dragon => {
+      e.shaped(Item.of(`iceandfire:${dragon.equals('ice') ? 'frost' : dragon}_lily`, 4), [
+        'ACA',
+        'BDB',
+        'ACA'
+      ], {
+        A: 'minecraft:lily_of_the_valley',
+        B: `iceandfire:${dragon}_dragon_heart`,
+        C: `iceandfire:${dragon}_dragon_flesh`,
+        D: 'mysticalagriculture:master_infusion_crystal'
+      }).id(`kubejs:shaped/iceandfire/${dragon}_lily`)
+    })
+  }
+  dragonFlowers([`fire`, `lightning`, `ice`])
 
   e.shaped('2x iceandfire:creative_dragon_meal', ['DDD', 'DSD', 'DDD'], {
     D: 'iceandfire:dragon_meal',
     S: 'atmadditions:atm_star'
-  })
+  }).id('kubejs:shaped/iceandfire/creative_dragon_meal')
 
+  let dragonColors = ['red', 'green', 'bronze', 'gray', 'blue', 'white', 'sapphire', 'silver', 'electric', 'amythest', 'copper', 'black']
   dragonColors.forEach(color => {
     e.shaped(`iceandfire:dragonegg_${color}`, ['DED', 'ESE', 'DED'], {
       S: 'atmadditions:atm_star',
       E: 'minecraft:dragon_egg',
       D: `iceandfire:dragonscales_${color}`
-    })
+    }).id(`kubejs:shaped/iceandfire/dragonegg_${color}`)
   })
 
   removeRecipeByID(e, [

kubejs/server_scripts/mod_specific/immersive_engineering/cloche.js

@@ -2,7 +2,7 @@ onEvent('recipes', e => {
   //#region FUNCTIONS
   function tier(types, time, soil, rCount) {
     types.forEach(type => {
-      e.recipes.immersiveengineering.cloche(Item.of(`mysticalagriculture:${type}_essence`, rCount), `mysticalagriculture:${type}_seeds`, soil, `mysticalagriculture:${type}_crop`).time(time)
+      e.recipes.immersiveengineering.cloche(Item.of(`mysticalagriculture:${type}_essence`, rCount), `mysticalagriculture:${type}_seeds`, soil, `mysticalagriculture:${type}_crop`).time(time).id(`kubejs:immersiveengineering/cloche/${type}`)
     })
   }
   function inf(rCount, time, soil) {
@@ -92,12 +92,14 @@ onEvent('recipes', e => {
     'uraninite',
     'wither_skeleton',
     'platinum',
-    'uranium'
+    'uranium',
+    'draconium'
   ], 4000, '#misctags:farmland/tier5', 2)
   //Tier 6 Crops
   tier([
     'dragon_egg',
-    'nether_star'
+    'nether_star',
+    'awakened_draconium'
   ], 4750, '#misctags:farmland/tier6', 2)
   //Magical Tier
   tier([

kubejs/server_scripts/mod_specific/mekanism/mekanism.js

@@ -65,6 +65,9 @@ onEvent('recipes', e => {
     I: 'mekanism:basic_induction_cell',
     U: 'allthemodium:unobtainium_boots'
   }).id(`kubejs:mekanism/mekasuit_boots`)
+  e.shaped('kubejs:yellow_cake_uranium_block', ['UUU', 'UUU', 'UUU'], {
+    U: 'mekanism:yellow_cake_uranium'
+  }).id(`kubejs:mekanism/yellow_cake_uranium_block`)
 
   e.recipes.mekanism.crushing('2x mekanism:bio_fuel', '#misctags:biofuel2')
   e.recipes.mekanism.crushing('4x mekanism:bio_fuel', '#misctags:biofuel4')

kubejs/server_scripts/mod_specific/mysticalagriculture/mysticalagriculture.js

@@ -29,13 +29,17 @@ onEvent('recipes', e => {
   essenceCircle('silentgear:azure_electrum_ingot', 4, 'azure_electrum')
   essenceCircle('silentgear:crimson_iron_ingot', 6, 'crimson_iron')
   essenceCircle('astralsorcery:aquamarine', 8, 'aquamarine')
+  essenceCircle('alltheores:copper_ingot', 6, 'copper')
 
   modifyShaped(e, 'mysticalagriculture:unattuned_augment', 1, ['PMP', 'AMA', 'PMP'], {
     P: 'mysticalagriculture:prosperity_ingot',
     M: 'botania:manasteel_ingot',
     A: '#forge:nuggets/allthemodium'
   })
-
+  e.shaped('8x bloodmagic:saltpeter', [' A ', ' A ', ' A '], {
+    A: 'mysticalagriculture:saltpeter_essence'
+  }).id('kubejs:mysticalagriculture/bloodmagic/saltpeter')
+  removeRecipeByID(e, ['mysticalagriculture:essence/common/saltpeter', 'mysticalagriculture:essence/common/copper_ingot'])
   e.recipes.mysticalagriculture.infusion({
     input: { item: 'mysticalagriculture:prosperity_seed_base' },
     ingredients: [{ tag: 'chisel:marble' }, { item: 'mysticalagriculture:prudentium_essence' }, { tag: 'chisel:marble' }, { item: 'mysticalagriculture:prudentium_essence' }, { tag: 'chisel:marble' }, { item: 'mysticalagriculture:prudentium_essence' }, { tag: 'chisel:marble' }, { item: 'mysticalagriculture:prudentium_essence' }],

kubejs/server_scripts/mod_specific/thermal/thermal.js

@@ -4,7 +4,7 @@ onEvent('recipes', e => {
   e.recipes.mekanism.crushing('thermal:diamond_dust', 'minecraft:diamond')
   e.recipes.mekanism.crushing('thermal:sulfur_dust', 'thermal:sulfur')
 
-  utils.listOf(['apatite', 'aquamarine', 'azure_silver', 'crimson_iron', 'ruby', 'sapphire', 'cobalt', 'fluorite', 'azure_electrum', 'hepatizon', 'draconium'])
+  utils.listOf(['apatite', 'aquamarine', 'azure_silver', 'crimson_iron', 'ruby', 'sapphire', 'cobalt', 'fluorite', 'azure_electrum', 'hepatizon', 'draconium', 'awakened_draconium'])
     .forEach(item => {
       e.recipes.thermal.insolator([`mysticalagriculture:${item}_essence`, `mysticalagriculture:${item}_seeds`], `mysticalagriculture:${item}_seeds`).water(500).id(`kubejs:thermal/insolator_${item}_seeds`)
     })

kubejs/server_scripts/mod_specific/universal_grid/universal_grid.js

@@ -0,0 +1,8 @@
+onEvent('recipes', e => {
+    e.shaped('universalgrid:creative_wireless_universal_grid', ['ABA', 'CBD', 'ABA'], {
+        A: 'minecraft:netherite_ingot',
+        B: 'refinedstorage:quartz_enriched_iron',
+        C: 'refinedstorageaddons:creative_wireless_crafting_grid',
+        D: 'universalgrid:wireless_universal_grid'
+    }).id('kubejs:universalgrid/creative_wireless_universal_grid')
+})

kubejs/server_scripts/unify.js

@@ -42,7 +42,7 @@ onEvent('recipes', e => {
             { item: 'engineerstools:crushing_hammer' }
           ],
           result: { item: dustItem, count: 2 },
-          aspects: { tool: 'engineerstools:crushing_hammer', tool_damage: 25 }
+          aspects: { tool: 'engineerstools:crushing_hammer', tool_damage: 10 }
         })
       }
       e.recipes.immersiveengineering.crusher({
@@ -113,53 +113,53 @@ onEvent('recipes', e => {
   // #region Plate Unification
   function plateCasting(material, coolingTime, result) {
     let alltheores = ['aluminum', 'copper', 'lead', 'nickel', 'osmium', 'platinum', 'silver', 'tin', 'uranium', 'zinc']
-    let fluid = alltheores.includes(material) ? {tag: `forge:molten_${material}`, amount: 144} : {name: `tconstruct:molten_${material}`, amount: 144}
+    let fluid = alltheores.includes(material) ? { tag: `forge:molten_${material}`, amount: 144 } : { name: `tconstruct:molten_${material}`, amount: 144 }
 
     e.custom({
       type: 'tconstruct:casting_table',
       conditions: [
         {
-          value: {tag: `forge:plates/${material}`, type: 'forge:tag_empty'},
+          value: { tag: `forge:plates/${material}`, type: 'forge:tag_empty' },
           type: 'forge:not'
         }
       ],
-      cast: {tag: 'tconstruct:casts/multi_use/plate'},
+      cast: { tag: 'tconstruct:casts/multi_use/plate' },
       fluid: fluid,
-      result: {item: result},
+      result: { item: result },
       cooling_time: coolingTime
     }).id(`kubejs:smeltery/casting/metal/${material}/plate_gold_cast`)
     e.custom({
       type: 'tconstruct:casting_table',
       conditions: [
         {
-          value: {tag: `forge:plates/${material}`, type: 'forge:tag_empty'},
+          value: { tag: `forge:plates/${material}`, type: 'forge:tag_empty' },
           type: 'forge:not'
         }
       ],
-      cast: {tag: 'tconstruct:casts/single_use/plate'},
+      cast: { tag: 'tconstruct:casts/single_use/plate' },
       cast_consumed: true,
       fluid: fluid,
-      result: {item: result},
+      result: { item: result },
       cooling_time: coolingTime
     }).id(`kubejs:smeltery/casting/metal/${material}/plate_sand_cast`)
   }
 
   function platePressing(material, result) {
     e.custom({
       type: 'immersiveengineering:metal_press',
-      mold: {item: 'immersiveengineering:mold_plate'},
-      result: {item: result},
+      mold: { item: 'immersiveengineering:mold_plate' },
+      result: { item: result },
       conditions: [
         {
-          value: {tag: `forge:ingots/${material}`, type: 'forge:tag_empty'},
+          value: { tag: `forge:ingots/${material}`, type: 'forge:tag_empty' },
           type: 'forge:not'
         },
         {
-          value: {tag: `forge:plates/${material}`, type: 'forge:tag_empty'},
+          value: { tag: `forge:plates/${material}`, type: 'forge:tag_empty' },
           type: 'forge:not'
         }
       ],
-      input: {tag: `forge:ingots/${material}`},
+      input: { tag: `forge:ingots/${material}` },
       energy: 2400
     }).id(`kubejs:metalpress/plate_${material}`)
   }
@@ -172,22 +172,22 @@ onEvent('recipes', e => {
 
       result = result ? result : `thermal:${material}_plate`
 
-      e.remove({id: `immersiveengineering:crafting/plate_${material}_hammering`});
+      e.remove({ id: `immersiveengineering:crafting/plate_${material}_hammering` });
       e.shapeless(result, [`#forge:ingots/${material}`, '#misctags:immersive_engineering_hammer']).id(`kubejs:crafting/plate_${material}_hammering`);
 
-      e.remove({id: `create:pressing/${material}_ingot`})
+      e.remove({ id: `create:pressing/${material}_ingot` })
       e.recipes.create.pressing(result, `#forge:ingots/${material}`).id(`kubejs:pressing/${material}_ingot`)
 
       if (coolingTime !== null) {
-        e.remove({id: `tconstruct:smeltery/casting/metal/${material}/plate_gold_cast`})
-        e.remove({id: `tconstruct:smeltery/casting/metal/${material}/plate_sand_cast`})
+        e.remove({ id: `tconstruct:smeltery/casting/metal/${material}/plate_gold_cast` })
+        e.remove({ id: `tconstruct:smeltery/casting/metal/${material}/plate_sand_cast` })
         plateCasting(material, coolingTime, result)
       }
 
-      e.remove({id: `immersiveengineering:metalpress/plate_${material}`})
+      e.remove({ id: `immersiveengineering:metalpress/plate_${material}` })
       platePressing(material, result)
 
-      e.remove({id: `thermal:machine/press/press_${material}_ingot_to_plate`})
+      e.remove({ id: `thermal:machine/press/press_${material}_ingot_to_plate` })
       e.recipes.thermal.press(result, `#forge:ingots/${material}`).id(`kubejs:machine/press/press_${material}_ingot_to_plate`)
     })
   }
@@ -482,7 +482,7 @@ onEvent('recipes', e => {
   e.replaceOutput('thermal:coal_coke_block', 'immersiveengineering:coke')
   e.replaceOutput('mekanism:dust_diamond', 'thermal:diamond_dust')
   e.replaceOutput('createaddition:diamond_grit', 'thermal:diamond_dust')
-  e.remove({id: 'thermal:storage/coal_coke_block'})
+  e.remove({ id: 'thermal:storage/coal_coke_block' })
 
   // #region Honey
   let simpleHoneys = ['cofh_core:honey', 'resourcefulbees:honey', 'cyclic:honey', 'create:honey']