Merge pull request #1908 from AllTheMods/Staging

Staging
AllTheMods · Jun 27, 2021 · 18f02bd · 18f02bd
2 parents bfb20dc + 60ee000
commit 18f02bd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml
@@ -21,5 +21,5 @@
 [packversionminrev]
 	#Pack Minor Version Revision : X
 	#Range: 0 ~ 32768
-	minorrev = 11
+	minorrev = 13
 
diff --git a/config/incontrol/spawn.json b/config/incontrol/spawn.json
@@ -48,23 +48,5 @@
       "perplayer": true
     },
     "result": "deny"
-  },
-  {
-    "dimension": "minecraft:overworld",
-    "mod": "iceandfire",
-	  "onjoin": true,
-    "result": "deny"
-  },
-  {
-    "dimension": "minecraft:the_nether",
-    "mod": "iceandfire",
-	  "onjoin": true,
-    "result": "deny"
-  },
-  {
-    "dimension": "minecraft:the_end",
-    "mod": "iceandfire",
-	  "onjoin": true,
-    "result": "deny"
   }
 ]
diff --git a/kubejs/server_scripts/recipe_fixes.js b/kubejs/server_scripts/recipe_fixes.js
@@ -1,5 +1,8 @@
 // this file remaps default mod recipes with parsing issues
 onEvent('recipes', e => {
+
+
+
     // #region Functions
     // Thermal resolving
     function thermalRemoval(entries) {
@@ -205,6 +208,7 @@ onEvent('recipes', e => {
     }).id(`kubejs:dragon_wing`)
     // #endregion Rats
 
+
     // #region Thermal
     e.custom({
         type: 'thermal:smelter',

diff --git a/kubejs/server_scripts/recipes.js b/kubejs/server_scripts/recipes.js
@@ -252,7 +252,15 @@ onEvent('recipes', e => {
     e.smelting('allthemodium:vibranium_allthemodium_alloy_ingot', 'allthemodium:vibranium_allthemodium_alloy_dust').xp(.5).id('kubejs:smelting/vibranium_allthemodium_alloy_dust')
     e.smelting('allthemodium:unobtainium_allthemodium_alloy_ingot', 'allthemodium:unobtainium_allthemodium_alloy_dust').xp(.5).id('kubejs:smelting/unobtainium_allthemodium_alloy_dust')
     e.smelting('allthemodium:unobtainium_vibranium_alloy_ingot', 'allthemodium:unobtainium_vibranium_alloy_dust').xp(.5).id('kubejs:smelting/unobtainium_vibranium_alloy_dust')
-
+    //Tinkers Quick Fix
+    e.shaped('tconstruct:smeltery_controller', [
+        'CCC',
+        'CSC',
+        'CCC'
+    ], {
+        C: '#forge:ingots/copper',
+        S: 'tconstruct:seared_melter'
+    })
     //Misc shaped recipes
     e.shaped('pamhc2foodcore:rolleritem', [
         'SLS'