Merge pull request #2080 from NillerMedDild/develop

0.4.10 part 2 ^^'
EnigmaticaModpacks · May 1, 2021 · 026607f · 026607f
2 parents 59739be + bfcf2a2
commit 026607f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js
@@ -322,7 +322,7 @@ events.listen('recipes', (event) => {
         },
         {
             inputs: [
-                '#minecraft:fire_charge',
+                'minecraft:fire_charge',
                 '#minecraft:coals',
                 '#minecraft:coals',
                 '#minecraft:soul_fire_base_blocks'

diff --git a/kubejs/server_scripts/enigmatica/kubejs/packmode.js b/kubejs/server_scripts/enigmatica/kubejs/packmode.js
@@ -14,17 +14,18 @@ if (config.mode == 'none') {
     config.mode = defaultConfig.mode;
     console.log(`Overwrote ${configName}, because the mode 'none' was found. Valid modes are 'normal' and 'expert'.`);
 }
+
 let packMode = config.mode;
-global.packmode = config.mode;
+
+global.packmode = packMode;
 global.isNormalMode = packMode == 'normal';
 global.isExpertMode = packMode == 'expert';
-console.log(`Current packmode is: ${global.packmode}`);
-console.log(`isNormalMode: ${global.isNormalMode}`);
-console.log(`isExpertMode: ${global.isExpertMode}`);
-
 const isNormalMode = packMode == 'normal';
 const isExpertMode = packMode == 'expert';
 
+console.log(`Current packmode is: ${global.packmode}`);
+console.log(`isNormalMode: ${global.isNormalMode}`);
+console.log(`isExpertMode: ${global.isExpertMode}`);
 console.log(`isNormalMode var: ${isNormalMode}`);
 console.log(`isExpertMode var: ${isExpertMode}`);
 

diff --git a/minecraftinstance.json b/minecraftinstance.json
@@ -30,8 +30,8 @@
   "isUnlocked": true,
   "javaArgsOverride": null,
   "javaDirOverride": null,
-  "lastPlayed": "2021-05-01T21:12:04.3638085Z",
-  "playedCount": 69,
+  "lastPlayed": "2021-05-01T21:58:14.5451755Z",
+  "playedCount": 70,
   "manifest": null,
   "fileDate": "0001-01-01T00:00:00",
   "installedModpack": null,