Merge pull request #3116 from AllTheMods/Staging

Release 1.8.27
AllTheMods · Jun 30, 2022 · 486aaf3 · 486aaf3
2 parents 97b1512 + 9255617
commit 486aaf3
Show file tree

Hide file tree

Showing 16 changed files with 141 additions and 15 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.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.27
         - 1.8.26
         - 1.8.25
         - 1.8.24

diff --git a/.github/ISSUE_TEMPLATE/crash.yaml b/.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.27
         - 1.8.26
         - 1.8.25
         - 1.8.24

diff --git a/changelog/1.8.27.md b/changelog/1.8.27.md
@@ -0,0 +1,38 @@
+# Release 1.8.27
+
+### Mod Updates
+- astralsorcery-1.16.5-1.14.1.jar
+- BloodMagic-1.16.4-3.1.11-34.jar
+- BrandonsCore-1.16.5-3.0.15.248-universal.jar
+- cc-tweaked-1.16.5-1.100.8.jar
+- Draconic-Evolution-1.16.5-3.0.26.459-universal.jar
+- DungeonCrawl-1.16.5-2.3.9.jar
+- EnchantmentDescriptions-1.16.5-7.1.20.jar
+- FramedBlocks-2.16.1.jar
+- incontrol-1.16-5.2.10.jar
+- mahoutsukai-1.16.5-v1.34.26.jar
+- mcjtylib-1.16-5.1.8.jar
+- mcw-fences-1.0.5-mc1.16.5.jar
+- Patchouli-1.16.4-53.3.jar
+- pneumaticcraft-repressurized-1.16.5-2.15.10-329.jar
+- ProjectRed-1.16.5-4.12.0-core.jar
+- ProjectRed-1.16.5-4.12.0-exploration.jar
+- ProjectRed-1.16.5-4.12.0-illumination.jar
+- ProjectRed-1.16.5-4.12.0-integration.jar
+- ProjectRed-1.16.5-4.12.0-transmission.jar
+- rftoolsbase-1.16-2.1.5.jar
+- rftoolsbuilder-1.16-3.1.11.jar
+- rftoolscontrol-1.16-4.0.18.jar
+- rftoolsdim-1.16-7.0.21.jar
+- rftoolsutility-1.16-3.1.16.jar
+- sophisticatedbackpacks-1.16.5-3.15.15.607.jar
+- tinyredstone-1.16.5-1.13.4.jar
+- tombstone-6.7.8-1.16.5.jar
+- xnet-1.16-3.0.17.jar
+
+### Other Changes
+- Disable Growth enchant due to bypassing crux requirement
+- Disable Tuberous exchanger
+- Fix missing Robit recipe
+- Add Pendorite and Emeraldite to void miner
+- Disable infinite disk recipe due to RS bug that deletes the contents when it goes over 2.14 billion items stored.
diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml
@@ -8,4 +8,4 @@
 [packversionmin]
 	minor = 8
 [packversionminrev]
-	minorrev = 26
+	minorrev = 27
diff --git a/config/cyclic.toml b/config/cyclic.toml
@@ -3,3 +3,4 @@
 		beheadingEntityMHF = []
 		magnet = false
 		traveler = false
+		growth = false
diff --git a/kubejs/client_scripts/jei_info.js b/kubejs/client_scripts/jei_info.js
@@ -12,4 +12,30 @@ onEvent('jei.information', e => {
     'The bottom block is Bedrock, above it an Anvil with an Item Frame on top. Hovering over the Item Frame, place Mjollnir.',
     '',
     'Once you have the structure, place your ATM Star in the item frame and click the hammer.'])
+
+  e.add('enderstorage:ender_chest', [
+    'Cross-dimensional wireless item transfer to any chest on the same channel.',
+    'Use dye on the colored bars to set the channel.',
+    'Use a diamond on the latch to switch to private channel.',
+  ])
+
+  e.add('enderstorage:ender_tank', [
+    'Cross-dimensional wireless fluid transfer to any tank on the same channel.',
+    'Use dye on the colored bars to set the channel.',
+    'Use a diamond on the latch to switch to private channel.',
+  ])
+
+  e.add('enderchests:ender_chest', [
+    'Cross-dimensional wireless item transfer to any chest on the same channel.',
+    'Use dye on the colored bars to set the channel.',
+    'Sneak + right-click with a diamond to switch to private channel.',
+    'Sneak + right-click with an ender pearl or eye of ender to increase inventory size.',
+  ])
+
+  e.add('endertanks:ender_tank', [
+    'Cross-dimensional wireless fluid transfer to any tank on the same channel.',
+    'Use dye on the colored bars to set the channel.',
+    'Sneak + right-click with a diamond to switch to private channel.',
+    'Sneak + right-click with an ender pearl or eye of ender to increase tank size.',
+  ])
 })
diff --git a/kubejs/client_scripts/jei_removals.js b/kubejs/client_scripts/jei_removals.js
@@ -126,7 +126,9 @@ onEvent('jei.hide.items', e => {
     'zycraft:quartz_bucket',
     'zycraft:aluminium_can',
     'compactmachines:tunnel',
-    'projectred-core:copper_ingot'
+    'exchangers:tuberous_exchanger',
+    'projectred-core:copper_ingot',
+    /^extradisks:infinite.*/,
   ])
 
   // only hide uncraftable spawn eggs

diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js
@@ -65,6 +65,10 @@ onEvent('item.tooltip', e => {
   formattedTooltip('astralsorcery:altar_discovery', 'Check the Astral Tome for more info')
   formattedTooltip('bloodmagic:strong_tau', 'Can be found in Blood Magic dungeons')
 
+  e.add(['extradisks:infinite_storage_disk', 'extradisks:infinite_fluid_storage_disk'], [
+    Text.of('Recipe disabled due to RS bug').red()
+  ])
+
   e.add(['resourcefulbees:t1_apiary', 'resourcefulbees:t2_apiary', 'resourcefulbees:t3_apiary', "resourcefulbees:t4_apiary"], [
     Text.of('Remove bees before upgrading to next tier.').red()
   ])

diff --git a/kubejs/data/byg/recipes/pendorite_ingots_from_block.json b/kubejs/data/byg/recipes/pendorite_ingots_from_block.json
@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "byg:pendorite_block"
+    }
+  ],
+  "result": {
+    "item": "byg:pendorite_ingot",
+    "count": 9
+  }
+}
diff --git a/kubejs/data/envirotech/envirotech/void_miner_drops/crystal/zycraft_quartz.json b/kubejs/data/envirotech/envirotech/void_miner_drops/crystal/zycraft_quartz.json
@@ -0,0 +1,10 @@
+{
+  "program": "envirotech:crystal",
+  "item": {"raw:item": "zycraft:quartz_crystal", "count":1},
+  "config": [
+    {
+      "dimensions": ["minecraft:overworld"],
+      "weight": 200
+    }
+  ]
+}
diff --git a/kubejs/data/envirotech/envirotech/void_miner_drops/ore/nether/byg_emeraldite.json b/kubejs/data/envirotech/envirotech/void_miner_drops/ore/nether/byg_emeraldite.json
@@ -0,0 +1,17 @@
+{
+  "programs": ["envirotech:ore", "envirotech:gemstone_ore"],
+  "item": {
+    "raw:item": "byg:emeraldite_ore", "count": 1
+  },
+  "config": [
+    {
+      "weight": 100,
+      "dimensions": ["minecraft:the_nether"]
+    },
+    {
+      "focus": "envirotech:green",
+      "weight": 400,
+      "dimensions": ["minecraft:the_nether"]
+    }
+  ]
+}
diff --git a/kubejs/data/envirotech/envirotech/void_miner_drops/ore/nether/byg_pendorite.json b/kubejs/data/envirotech/envirotech/void_miner_drops/ore/nether/byg_pendorite.json
@@ -0,0 +1,17 @@
+{
+  "programs": ["envirotech:ore", "envirotech:metallic_ore"],
+  "item": {
+    "raw:item": "byg:pendorite_ore", "count": 1
+  },
+  "config": [
+    {
+      "weight": 100,
+      "dimensions": ["minecraft:the_nether"]
+    },
+    {
+      "focus": "envirotech:purple",
+      "weight": 400,
+      "dimensions": ["minecraft:the_nether"]
+    }
+  ]
+}
diff --git a/kubejs/server_scripts/mod_specific/_misc/misc.js b/kubejs/server_scripts/mod_specific/_misc/misc.js
@@ -60,6 +60,7 @@ onEvent('recipes', e => {
   removeRecipeByOutput(e, [
     'darkutils:ender_hopper',
     'naturesaura:chunk_loader',
+    'exchangers:tuberous_exchanger',
     'titanium:iron_gear',
     'titanium:gold_gear',
     'titanium:diamond_gear'

diff --git a/kubejs/server_scripts/mod_specific/immersive_engineering/immersive_engineering.js b/kubejs/server_scripts/mod_specific/immersive_engineering/immersive_engineering.js
@@ -59,6 +59,9 @@ onEvent('recipes', e => {
     T: '#forge:treated_wood',
     R: 'mekanism:resistive_heater'
   })
+  modifyShaped(e, 'immersiveengineering:sawdust', 6, ['   ', 'SSS', 'SSS'], {
+    S: '#forge:dusts/wood'
+  })
 
   e.replaceInput('immersiveengineering:hammer', '#misctags:immersive_engineering_hammer')
   e.replaceInput('immersiveengineering:wirecutter', '#misctags:immersive_engineering_wirecutter')

diff --git a/kubejs/server_scripts/mod_specific/mekanism/mekanism.js b/kubejs/server_scripts/mod_specific/mekanism/mekanism.js
@@ -105,7 +105,6 @@ onEvent('recipes', e => {
     'mekanism:mekasuit_boots',
     'mekanism:processing/diamond/to_dust',
     'mekanism:gas_conversion/salt_to_hydrogen_chloride',
-    'mekanism:robit',
     'mekanism:bio_fuel',
   ])
   removeRecipeByOutput(e, [

diff --git a/kubejs/server_scripts/mod_specific/refinedstorage/refinedstorage.js b/kubejs/server_scripts/mod_specific/refinedstorage/refinedstorage.js
@@ -115,18 +115,6 @@ onEvent('recipes', e => {
     b: '#forge:dusts/redstone',
     n: '#forge:ingots/unobtainium'
   }).id(`kubejs:1048576k_storage_part`)
-  e.shaped('extradisks:infinite_fluid_storage_part', ['ana', 'fbf', 'afa'], {
-    a: 'refinedstorage:advanced_processor',
-    f: 'extradisks:1048576k_fluid_storage_part',
-    b: 'minecraft:bucket',
-    n: '#forge:ingots/unobtainium'
-  }).id('kubejs:infinite_fluid_part')
-  e.shaped('extradisks:infinite_storage_part', ['ana', 'fbf', 'afa'], {
-    a: 'refinedstorage:advanced_processor',
-    f: 'extradisks:1048576k_storage_part',
-    b: '#forge:dusts/redstone',
-    n: '#forge:ingots/unobtainium'
-  }).id('kubejs:infinite_storage_part')
   e.shaped('creativewirelesstransmitter:creative_wireless_transmitter', ['ITI', 'ICI', 'IDI'], {
     I: 'allthemodium:unobtainium_ingot',
     D: 'rsinfinitybooster:dimension_card',
@@ -154,6 +142,12 @@ onEvent('recipes', e => {
     'extradisks:part/1048576k_storage_part',
     'extradisks:part/infinite_fluid_storage_part',
     'extradisks:part/infinite_storage_part',
+    'extradisks:disk/shaped/infinite_fluid_storage_disk',
+    'extradisks:disk/shaped/infinite_storage_disk',
+    'extradisks:disk/shapeless/infinite_fluid_storage_disk',
+    'extradisks:disk/shapeless/infinite_storage_disk',
+    'extradisks:blocks/infinite_fluid_storage_block',
+    'extradisks:blocks/infinite_storage_block',
     /^extrastorage:(?:part|disk|storage_block)\/.+/,
     'creativecrafter:creative_crafter',
     'creativewirelesstransmitter:creative_wireless_transmitter',