Merge pull request #1578 from AllTheMods/update-prep

Update prep for 0.4.33

changelogs/0.4.33.md

@@ -0,0 +1,82 @@
+## Release 0.4.33
+
+### Mod Additions
+- modonomicon-1.18.2-1.4.0.jar
+### Mod Updates
+- AI-Improvements-1.18.2-0.5.2.jar
+- allthemodium-1.9.6-1.18.2-40.1.51.jar
+- allthetweaks-1.9.9.6-1.18.2-40.1.60.jar
+- appliedenergistics2-forge-11.6.1-beta.jar
+- archers_paradox-1.18.2-3.0.0.8.jar
+- BambooEverything-forge-1.3.3-build.34+mc1.18.2.jar
+- cc-tweaked-1.18.2-1.100.10.jar
+- chipped-2.0.0-forge.jar
+- cofh_core-1.18.2-9.0.0.24.jar
+- comforts-forge-1.18.2-5.0.0.5.jar
+- configured-2.0.0-1.18.2.jar
+- cookingforblockheads-forge-1.18.2-12.1.1.jar
+- CosmeticArmorReworked-1.18.2-v2a.jar
+- create-1.18.2-0.5.0.e.jar
+- deepresonance-3.0.15.jar
+- elementalcraft-1.18.2-4.4.28.jar
+- ensorcellation-1.18.2-3.0.0.10.jar
+- EvilCraft-1.18.2-1.2.10.jar
+- FarmersDelight-1.18.2-1.2.0.jar
+- FramedBlocks-5.8.0.jar
+- ftb-ultimine-forge-1802.3.3-build.67.jar
+- HostileNeuralNetworks-1.18.2-3.2.2.jar
+- incontrol-1.18-6.0.18.jar
+- IntegratedCrafting-1.18.2-1.0.25.jar
+- IntegratedDynamics-1.18.2-1.11.12.jar
+- IntegratedTerminals-1.18.2-1.4.0.jar
+- IntegratedTunnels-1.18.2-1.8.15.jar
+- ironchests-2.0.4-forge.jar
+- item-filters-forge-1802.2.8-build.40.jar
+- kubejs-forge-1802.5.5-build.550.jar
+- lazierae2-1.18.2-3.1.3.jar
+- LightingWand-1.18.2-forge-4.1.1.jar
+- lostcities-1.18-5.3.11.jar
+- mcjtylib-1.18-6.0.17.jar
+- mcw-bridges-2.0.5-mc1.18.2forge.jar
+- MEGACells-1.4.0-1.18.2.jar
+- minecolonies-1.18.2-1.0.1048-BETA.jar
+- mob_grinding_utils-1.18.2-0.4.46.jar
+- modonomicon-1.18.2-1.4.0.jar
+- MysticalAgriculture-1.18.2-5.1.2.jar
+- occultism-1.18.2-1.41.3.jar
+- Oh_The_Biomes_You'll_Go-forge-1.18.2-1.4.5.jar
+- omgourd-1.18.2-3.0.0.7.jar
+- pneumaticcraft-repressurized-1.18.2-3.4.3-8.jar
+- polymorph-forge-1.18.2-0.45.jar
+- Powah-3.0.5-beta.jar
+- productivebees-1.18.2-0.9.1.6.jar
+- reliquary-1.18.2-2.0.19.1161.jar
+- rftoolsbuilder-1.18-4.0.16.jar
+- rftoolscontrol-1.18-5.0.8.jar
+- rftoolspower-1.18-4.0.7.jar
+- rftoolsstorage-1.18-3.0.11.jar
+- rftoolsutility-1.18-4.0.19.jar
+- rhino-forge-1802.2.1-build.240.jar
+- RSInfinityBooster-1.18.2-2.1+20.jar
+- silent-gear-1.18.2-2.10.15.jar
+- simplylight-1.18.2-1.4.5-build.43.jar
+- sophisticatedbackpacks-1.18.2-3.18.29.718.jar
+- sophisticatedcore-1.18.2-0.5.13.132.jar
+- sophisticatedstorage-1.18.2-0.5.17.152.jar
+- supplementaries-1.18.2-1.5.9.jar
+- TConstruct-1.18.2-3.5.2.40.jar
+- thermal_cultivation-1.18.2-9.0.0.13.jar
+- thermal_expansion-1.18.2-9.0.0.15.jar
+- thermal_foundation-1.18.2-9.0.0.32.jar
+- thermal_innovation-1.18.2-9.0.0.14.jar
+- thermal_locomotion-1.18.2-9.0.0.10.jar
+- tombstone-7.5.4-1.18.2.jar
+- twilightforest-1.18.2-4.1.1423-universal.jar
+- xnet-1.18-4.0.7.jar
+
+### Other Changes
+- Add blocks with relocation_not_supported tag to Building Gadgets blacklist (#1567)
+- Fix FTBIC gear unification
+- Add alternate enderium dust recipe
+- Fix silicon unification (#1573)
+- Fix Mekanism enrichment recipes for raw ore blocks (#1572)

config/allthetweaks-common.toml

@@ -21,7 +21,7 @@
 [packversionminrev]
 	#Pack Minor Version Revision : X
 	#Range: 0 ~ 32768
-	minorrev = 32
+	minorrev = 33
 
 [tweaks]
 	#Chickens randomly shed feathers

kubejs/data/mysticalagriculture/recipes/essence/appliedenergistics2/silicon_press.json

@@ -0,0 +1,26 @@
+{
+  "type": "cucumber:shaped_no_mirror",
+  "conditions": [
+    {
+      "type": "mysticalagriculture:crop_enabled",
+      "crop": "mysticalagriculture:certus_quartz"
+    }
+  ],
+  "pattern": [
+    "EEE",
+    "EME",
+    "EEE"
+  ],
+  "key": {
+    "E": {
+      "item": "mysticalagriculture:certus_quartz_essence"
+    },
+    "M": {
+      "tag": "forge:silicon"
+    }
+  },
+  "result": {
+    "item": "ae2:silicon_press",
+    "count": 1
+  }
+}

kubejs/server_scripts/tags.js

@@ -7,6 +7,7 @@ onEvent('tags.blocks', e => {
   e.add('forge:relocation_not_supported', [/productivebees:.+/, 'minecraft:beehive', 'minecraft:bee_nest', /integrateddynamics:.+/,/botania:.+/, '@waystones'])
   e.add('minecraft:mineable/axe', ['integrateddynamics:menril_log_stripped', 'integrateddynamics:menril_wood_stripped'])
   e.add('minecraft:logs', ['integrateddynamics:menril_log_stripped', 'integrateddynamics:menril_wood_stripped', 'evilcraft:undead_log_stripped', 'evilcraft:undead_wood_stripped', /allthemodium:stripped_\w+_log/])
+  e.add('buildinggadgets:blacklist/generic', '#forge:relocation_not_supported')
 })
 
 onEvent('tags.items', e => {
@@ -41,8 +42,8 @@ onEvent('tags.items', e => {
   e.add('forge:melons','minecraft:melon_slice')
   e.add('forbidden_arcanus:modifier/eternal_incompatible',[
     '#alltheores:ore_hammers','@ftbic','#tconstruct:modifiable',
-    'minecraft:nether_star','mythicbotany:faded_nether_star', 
-    'bloodmagic:sanguinereverter', 'elementalcraft:receptacle', 'elementalcraft:receptacle_empty', 
+    'minecraft:nether_star','mythicbotany:faded_nether_star',
+    'bloodmagic:sanguinereverter', 'elementalcraft:receptacle', 'elementalcraft:receptacle_empty',
     'elementalcraft:receptacle_improved', 'elementalcraft:receptacle_improved_empty'
   ])
 

kubejs/server_scripts/unify.js

@@ -61,6 +61,15 @@ onEvent('recipes', e => {
       e.remove({ id: `mekanism:processing/${metal}/dust/from_raw_ore` })
     }
 
+    if (type === 'raw_block') {
+      input = `#forge:storage_blocks/raw_${metal}`;
+      inputCount = 1;
+      output = `${craftOverride[metal] ?? 'alltheores'}:${metal}_dust`;
+      outputCount = 12;
+
+      e.remove({ id: `mekanism:processing/${metal}/dust/from_raw_block` })
+    }
+
     if (type === 'dirty_dust') {
       input = `#mekanism:dirty_dusts/${metal}`;
       output = `${craftOverride[metal] ?? 'alltheores'}:${metal}_dust`;
@@ -339,13 +348,13 @@ onEvent('recipes', e => {
   // unify pressing for FTB Industrial Contraptions
   // supported types: plates, rods, gears
   function ftbicUnifyPress(metal, type) {
-    let recipeType = 'rolling';
+    let recipeType = 'extruding';
     let inputTag = `#forge:ingots/${metal}`;
     let inputCount = 1;
     let output = `${craftOverride[metal] ?? 'alltheores'}:${metal}_${type}`
 
-    if (type === 'rod') {
-      recipeType = 'extruding';
+    if (type === 'plate') {
+      recipeType = 'rolling';
     }
 
     if (type === 'gear') {
@@ -734,7 +743,7 @@ onEvent('recipes', e => {
   });
 
   vanillaMetals.concat(mekanismMetals).forEach(ore => {
-    ['ore', 'raw_ore', 'ingot', 'dirty_dust'].forEach(type => mekUnifyOres(ore, type));
+    ['ore', 'raw_ore', 'raw_block', 'ingot', 'dirty_dust'].forEach(type => mekUnifyOres(ore, type));
   });
 
   mekanismMetals.forEach(metal => {
@@ -788,7 +797,7 @@ onEvent('recipes', e => {
     e.remove({ id: `ftbic:shaped/ingots/${metal}_to_${metal}_gear` })
     e.remove({ id: `ftbic:extruding/ingots/${metal}_to_${metal}_rod` })
     e.remove({ id: `ftbic:rolling/ingots/${metal}_to_${metal}_plate` })
-    e.remove({ id: `ftbic:rolling/plates/${metal}_to_${metal}_gear` })
+    e.remove({ id: `ftbic:extruding/plates/${metal}_to_${metal}_gear` })
     e.remove({ id: `ftbic:shapeless/${metal}_block_to_${metal}_ingot` })
     e.remove({ id: `ftbic:shaped/${metal}_ingot_to_${metal}_block` })
     e.remove({ id: `ftbic:shapeless/${metal}_ingot_to_${metal}_nugget` })
@@ -899,9 +908,16 @@ onEvent('recipes', e => {
   // temporary for missing recipes
   e.shapeless('2x kubejs:cobalt_dust',['#forge:raw_ores/cobalt','#alltheores:ore_hammers'])
 
+  e.shapeless('4x alltheores:enderium_dust', [
+    '3x #forge:dusts/lead',
+    '#forge:dusts/platinum',
+    '4x #forge:dusts/ender_pearl',
+  ])
+
   // recipe fixes
   e.replaceInput({id:'littlecontraptions:contraption_barge'}, 'create:brass_ingot', '#forge:ingots/brass')
   e.replaceOutput({}, '#forge:dusts/diamond', 'alltheores:diamond_dust')
+  e.replaceInput('refinedstorage:silicon', '#forge:silicon')
   e.remove({type: 'immersiveengineering:metal_press', output: 'minecraft:blaze_rod'})
 
   removeRecipeByID(e, [