Merge pull request #2793 from AllTheMods/Staging

Staging
AllTheMods · Dec 10, 2021 · b463db9 · b463db9
2 parents 4fe5d00 + 7a0f639
commit b463db9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 25 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.14
         - 1.8.13
         - 1.8.12
         - 1.8.11

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.14
         - 1.8.13
         - 1.8.12
         - 1.8.11

diff --git a/changelog/1.8.13.md b/changelog/1.8.13.md
@@ -3,7 +3,7 @@
 ### Mod Additions:
 - norecipeadvancements-1.0.0.jar
 ### Other Changes:
-* **IMPORTANT** Updated to Forge 3.6.20. This fixes a bug that lets other players on a server run code on your computer. It is highly recommended that you update.
+* **IMPORTANT** Updated to Forge 36.2.20. This fixes a bug that lets other players on a server run code on your computer. It is highly recommended that you update.
 * Removed Enderchests and Ender Tank recipes, and added conversion recipes to Ender Storage.
 
 **Full Changelog**: https://github.com/AllTheMods/ATM-6/compare/1.8.12...1.8.13

diff --git a/changelog/1.8.14.md b/changelog/1.8.14.md
@@ -0,0 +1,8 @@
+## Release 1.8.14
+
+### Other Changes:
+* Fixed KubeJS error that was removing too many recipes.
+
+**Full Changelog**: https://github.com/AllTheMods/ATM-6/compare/1.8.13...1.8.14
+
+--------------------------------------------------------------------------------
diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml
@@ -8,4 +8,4 @@
 [packversionmin]
 	minor = 8
 [packversionminrev]
-	minorrev = 13
+	minorrev = 14
diff --git a/kubejs/server_scripts/mod_specific/enderstorage/enderstorage.js b/kubejs/server_scripts/mod_specific/enderstorage/enderstorage.js
@@ -1,27 +1,8 @@
 onEvent('recipes', e => {
-  e.shapeless("enderstorage:ender_chest", "#forge:chests/ender").id('kubejs:shapeless/enderstorage/conversion1')
+  e.shapeless("enderstorage:ender_chest", "enderchests:ender_chest").id('kubejs:shapeless/enderstorage/conversion1')
   e.shapeless("enderstorage:ender_pouch", "enderchests:ender_bag").id('kubejs:shapeless/enderstorage/conversion2')
-  e.shapeless("enderstorage:ender_tank", "#forge:tanks/ender").id('kubejs:shapeless/enderstorage/conversion3')
+  e.shapeless("enderstorage:ender_tank", "endertanks:ender_tank").id('kubejs:shapeless/enderstorage/conversion3')
 
-  modifyShaped(e, 'enderstorage:ender_chest', 1, ['BWB', 'OCO', 'BEB'], {
-    B: '#forge:rods/blaze',
-    W: '#forge:wool',
-    O: '#forge:obsidian',
-    C: '#forge:chests',
-    E: '#forge:ender_pearls'
-  })
-  modifyShaped(e, 'enderstorage:ender_pouch', 1, ['BLB', 'LEL', 'BWB'], {
-    B: 'minecraft:blaze_powder',
-    W: '#forge:wool',
-    L: '#forge:leather',
-    E: '#forge:ender_pearls'
-  })
-  modifyShaped(e, 'enderstorage:ender_tank', 1, ['BWB', 'OCO', 'BEB'], {
-    B: '#forge:rods/blaze',
-    W: '#forge:wool',
-    O: '#forge:obsidian',
-    C: 'minecraft:cauldron',
-    E: '#forge:ender_pearls'
-  })
-  e.remove({ MOD: ['enderchest', 'endertanks'] })
+  e.remove({mod: 'enderchests'})
+  e.remove({mod: 'endertanks'})
 })
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ body: @@
           label: Modpack Version
           description: What version of the pack are you using?
           options:
+            - 1.8.14
             - 1.8.13
             - 1.8.12
             - 1.8.11
@@ Expand Down @@