Merge pull request AllTheMods#2807 from jeremiahwinsley/cc-modem

fix modem recipe conflict
TinyPandas · Dec 15, 2021 · 8f1d9f8 · 8f1d9f8
2 parents 440ffe0 + c7a876f
commit 8f1d9f8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/changelog/1.8.15.md b/changelog/1.8.15.md
@@ -1,12 +1,14 @@
 ## Release 1.8.15
 
 ### Mod Additions
-- HostileNeuralNetworks-1.16.5-1.0.1.jar
+- HostileNeuralNetworks-1.16.5-1.0.2.jar
 - time-in-a-bottle-1.1.0.jar
 ### Mod Updates
+- AdChimneys-1.16.5-6.0.12.3-build.0207.jar
+- advancedperipherals-1.16.5-0.7.6r.jar
 - archers_paradox-1.16.5-1.4.0.1.jar
-- architectury-1.26.38.jar
-- ars_nouveau-1.16.5-1.24.7.jar
+- architectury-1.26.39.jar
+- ars_nouveau-1.16.5-1.24.8.jar
 - Botania-1.16.5-420.1.jar
 - BotanyPots-1.16.5-7.1.30.jar
 - cabletiers-1.16.5-0.543.jar
@@ -18,22 +20,31 @@
 - enderchests-1.16-1.7.9.jar
 - endertanks-1.16-1.9.7.jar
 - ensorcellation-1.16.5-1.4.0.1.jar
+- FastWorkbench-1.16.5-4.6.1.jar
 - FramedBlocks-2.11.2.jar
 - ftb-library-forge-1605.3.4-build.90.jar
 - geckolib-forge-1.16.5-3.0.57.jar
+- globalxp-1.16.5-v1.9.jar
 - Iceberg-1.16.5-1.0.30.jar
 - IntegratedTunnels-1.16.5-1.8.9.jar
 - JustEnoughResources-1.16.5-0.12.1.133.jar
 - kubejs-forge-1605.3.19-build.229.jar
 - kubejs-thermal-1605.1.4-build.3.jar
 - lootr-1.16.5-0.0.9.30.jar
 - mahoutsukai-1.16.5-v1.33.6.jar
-- mana-and-artifice-1.5.1.1.jar
+- mana-and-artifice-1.5.1.2.jar
 - Mantle-1.16.5-1.6.147.jar
 - mcjtylib-1.16-5.1.2.jar
+- mcw-bridges-2.0.1-mc1.16.5.jar
+- mcw-doors-1.0.5-mc1.16.5.jar
+- mcw-fences-1.0.2-mc1.16.5.jar
+- mcw-trapdoors-1.0.4-mc1.16.5.jar
+- mcw-windows-2.0.2-mc1.16.5.jar
+- minecolonies-1.16.5-1.0.296-BETA.jar
 - MysticalAgradditions-1.16.5-4.2.4.jar
 - MysticalAgriculture-1.16.5-4.2.6.jar
 - MysticalCustomization-1.16.5-2.1.7.jar
+- MythicBotany-1.16.5-1.4.19.jar
 - omgourd-1.16.5-1.4.0.1.jar
 - repurposed_structures_forge-3.4.7+1.16.5.jar
 - restrictions-1.16-3.0.5.jar
@@ -62,3 +73,4 @@
 - Final quest now requires 1x instead of 9x ATM Star Block - 100% completion should now be possible.
 - Add unification for zinc plates
 - Disable Quark recipe book unlocking to fix oversized playerdata files.
+- Adjust Computercraft wired modem recipe to fix conflict with network cable
diff --git a/kubejs/server_scripts/mod_specific/computercraft/computercraft.js b/kubejs/server_scripts/mod_specific/computercraft/computercraft.js
@@ -9,7 +9,7 @@ onEvent('recipes', e => {
     C: 'computercraft:computer_normal',
     A: '#forge:ingots/allthemodium'
   })
-  modifyShaped(e, 'computercraft:wired_modem', 1, [' S ', 'SRS', ' S '], {
+  modifyShaped(e, 'computercraft:wired_modem', 1, ['S S', ' R ', 'S S'], {
     S: '#forge:stone',
     R: '#forge:dusts/redstone'
   })