From a41e5aeb260d492062cfdb624a48ee8b59f9f7df Mon Sep 17 00:00:00 2001 From: Jeremiah Winsley Date: Tue, 14 Dec 2021 21:22:02 -0500 Subject: [PATCH 1/2] fix modem recipe conflict --- changelog/1.8.15.md | 18 +++++++++++++++--- .../computercraft/computercraft.js | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/changelog/1.8.15.md b/changelog/1.8.15.md index 6d904b2a..404366bd 100644 --- a/changelog/1.8.15.md +++ b/changelog/1.8.15.md @@ -4,9 +4,11 @@ - HostileNeuralNetworks-1.16.5-1.0.1.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,9 +20,11 @@ - 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 @@ -28,12 +32,19 @@ - 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 index d5778a10..0c84e2ac 100644 --- 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' }) From c7a876f7d82bc46e8d36519de44ab4d54c6ea3ba Mon Sep 17 00:00:00 2001 From: Jeremiah Winsley Date: Tue, 14 Dec 2021 21:26:33 -0500 Subject: [PATCH 2/2] fix version number --- changelog/1.8.15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/1.8.15.md b/changelog/1.8.15.md index 404366bd..16ca1fc0 100644 --- a/changelog/1.8.15.md +++ b/changelog/1.8.15.md @@ -1,7 +1,7 @@ ## 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