Merge pull request #2811 from AllTheMods/Staging

Release 1.8.15
AllTheMods · Dec 17, 2021 · 5234fe6 · 5234fe6
2 parents b463db9 + 9d78f7a
commit 5234fe6
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 16 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.15
         - 1.8.14
         - 1.8.13
         - 1.8.12

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.15
         - 1.8.14
         - 1.8.13
         - 1.8.12

diff --git a/changelog/1.8.15.md b/changelog/1.8.15.md
@@ -0,0 +1,81 @@
+## Release 1.8.15
+
+### Mod Additions
+- 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
+- allthetweaks-1.4.4-1.16.5-36.1.13.jar
+- Apotheosis-1.16.5-4.8.4.jar
+- archers_paradox-1.16.5-1.4.0.1.jar
+- architectury-1.26.39.jar
+- ars_nouveau-1.16.5-1.24.8.jar
+- BloodMagic-1.16.4-3.1.7-27.jar
+- Botania-1.16.5-420.1.jar
+- BotanyPots-1.16.5-7.1.30.jar
+- cabletiers-1.16.5-0.543.jar
+- cc-tweaked-1.16.5-1.99.1.jar
+- cloth-config-4.13.49-forge.jar
+- CodeChickenLib-1.16.5-4.0.5.438-universal.jar
+- cofh_core-1.16.5-1.4.0.6.jar
+- constructionwand-1.16.5-2.6.jar
+- 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.3.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.309-RELEASE.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
+- pipez-1.16.5-1.2.15.jar
+- repurposed_structures_forge-3.4.7+1.16.5.jar
+- restrictions-1.16-3.0.5.jar
+- rftoolsbase-1.16-2.1.1.jar
+- rftoolsbuilder-1.16-3.1.4.jar
+- rftoolscontrol-1.16-4.0.13.jar
+- rftoolsdim-1.16-7.0.19-beta.jar
+- rftoolspower-1.16-3.0.11.jar
+- rftoolsstorage-1.16-2.0.15.jar
+- rftoolsutility-1.16-3.1.6.jar
+- simplemagnets-1.1.3-mc1.16.jar
+- simplylight-1.16.5-1.4.0-build.24.jar
+- sophisticatedbackpacks-1.16.5-3.12.2.432.jar
+- TConstruct-1.16.5-3.3.0.308.jar
+- thermal_cultivation-1.16.5-1.4.1.3.jar
+- thermal_expansion-1.16.5-1.4.1.3.jar
+- thermal_foundation-1.16.5-1.4.1.7.jar
+- thermal_innovation-1.16.5-1.4.1.3.jar
+- thermal_locomotion-1.16.5-1.4.1.2.jar
+- tinyredstone-1.16.5-1.13.0.jar
+- ToastControl-1.16.5-4.4.0.jar
+- topaddons-1.16.5-2.2.0-beta.jar
+- upgrade_aquatic-1.16.5-3.1.2.jar
+- xnet-1.16-3.0.15.jar
+### Other Changes
+- 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
+- Fix JEI quantity for inferium seeds in cloche
diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml
@@ -8,4 +8,4 @@
 [packversionmin]
 	minor = 8
 [packversionminrev]
-	minorrev = 14
+	minorrev = 15
diff --git a/config/ftbquests/quests/chapters/creative.snbt b/config/ftbquests/quests/chapters/creative.snbt
@@ -35,7 +35,7 @@
 		{
 			title: "Create"
 			x: -0.5d
-			y: -3.0d			
+			y: -3.0d
 			hide_dependency_lines: true
 			id: "2CF11A70229000AB"
 			tasks: [
@@ -596,9 +596,10 @@
 			}]
 		}
 		{
+			title: "Set For Life"
 			x: 0.0d
 			y: -5.5d
-			subtitle: "Become God???"
+			subtitle: "Enough to make everything in the pack?"
 			hide_dependency_lines: true
 			dependencies: [
 				"2CF11A70229000AB"
@@ -620,7 +621,12 @@
 			tasks: [{
 				id: "0814C4E6DE262193"
 				type: "item"
-				item: "allthecompressed:atm_star_block_9x"
+				item: "allthecompressed:atm_star_block_1x"
+			}]
+			rewards: [{
+				id: "31A7D5AEF21B43BC"
+				type: "item"
+				item: "allthetweaks:trophy_atm"
 			}]
 		}
 		{

diff --git a/config/quark-common.toml b/config/quark-common.toml
@@ -25,6 +25,7 @@
 	[tools.color_runes]
 		"Apply Cost" = 15
 [tweaks]
+	"Automatic Recipe Unlock" = false
 	"Compasses Work Everywhere" = false
 	[tweaks.compasses_work_everywhere]
 		"Enable Compass Nerf" = false

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'
   })

diff --git a/kubejs/server_scripts/mod_specific/immersive_engineering/cloche.js b/kubejs/server_scripts/mod_specific/immersive_engineering/cloche.js
@@ -112,14 +112,4 @@ onEvent('recipes', e => {
   regular(['forbidden_arcanus:arcane_gold_nugget', 'forbidden_arcanus:golden_orchid_seeds'], 'forbidden_arcanus:golden_orchid_seeds', 'forbidden_arcanus:golden_orchid')
   regular([Item.of('silentgear:flax_fiber', 2), 'silentgear:flax_seeds'], 'silentgear:flax_seeds', 'silentgear:flax_plant')
   regular([Item.of('byg:blueberries', 2)], 'byg:blueberries', 'byg:blueberry_bush')
-
-  //Inferium
-  inf(1, 1000, 'minecraft:dirt')
-  inf(2, 1750, 'mysticalagriculture:inferium_farmland')
-  inf(3, 2500, 'mysticalagriculture:prudentium_farmland')
-  inf(4, 3250, 'mysticalagriculture:tertium_farmland')
-  inf(5, 4000, 'mysticalagriculture:imperium_farmland')
-  inf(6, 4750, 'mysticalagriculture:supremium_farmland')
-  inf(7, 5500, 'mysticalagradditions:insanium_farmland')
-  //#endregion
 })
diff --git a/kubejs/server_scripts/unify.js b/kubejs/server_scripts/unify.js
@@ -176,6 +176,7 @@ onEvent('recipes', e => {
       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: `createaddition:pressing/${material}_ingot` })
       e.recipes.create.pressing(result, `#forge:ingots/${material}`).id(`kubejs:pressing/${material}_ingot`)
 
       if (coolingTime !== null) {
@@ -210,7 +211,8 @@ onEvent('recipes', e => {
     ['signalum', null],
     ['lumium', null],
     ['enderium', null],
-    ['brass', 57, 'create:brass_sheet']
+    ['brass', 57, 'create:brass_sheet'],
+    ['zinc', 57, 'createaddition:zinc_sheet'],
   ])
   // #endregion Plate Unification
   // #region Tinkers Unification