Dmitry S 4 years ago
parent
commit
ba2ae0db69
4 changed files with 14 additions and 10 deletions
  1. 3 0
      .gitignore
  2. 1 1
      index.js
  3. 7 7
      manifest.json
  4. 3 2
      module.json

+ 3 - 0
.gitignore

@@ -0,0 +1,3 @@
+.eslintrc.json
+manifest-generator.bat
+manifest-generator.js

+ 1 - 1
index.js

@@ -68,7 +68,7 @@ exports.NetworkMod = function(mod) {
             }
             }
 
 
             case 'merge': {
             case 'merge': {
-                hook('merge', 'S_REQUEST_CONTRACT', mod.majorPatchVersion ? 2 : 1, event => {
+                hook('merge', 'S_REQUEST_CONTRACT', 1, event => {
                     if (!mod.game.me.is(event.senderId) || event.type != 33)
                     if (!mod.game.me.is(event.senderId) || event.type != 33)
                         return;
                         return;
 
 

+ 7 - 7
manifest.json

@@ -1,9 +1,9 @@
 {
 {
-	"files": {
-		"index.js": "714b77fba3033e97d3fc25c8c00944190621c85f91bc5bff02fd43c0826833ba",
-		"settings_migrator.js": "823fc1c204003a4a782e23b1a0781b9ee48d2865004a8acb73359777c0c067bc",
-		"settings_structure.js": "76520793fad024750498529f19c830819b5d9e3b0ab6aa408caaf32c0c7b2000",
-		"module.json": "ec9e118ef92578fdc151ab899ecd5de100070393615a0d3a2719851b79b272ba",
-		"README.md": "832ff75e5d01aed23c836805f5523c26393c0697de5c7d1ffc26a3017a6d769e"
-	}
+    "files": {
+        "README.md": "832ff75e5d01aed23c836805f5523c26393c0697de5c7d1ffc26a3017a6d769e",
+        "index.js": "3dbf5d171e205e132f6254fcaacbdc4eec8af54e2a1505b6be0a8ab8cc7b10ed",
+        "module.json": "683bef7d64be89782950ddfb0d4c75c7024545df223dab3709aedd68cde0ab15",
+        "settings_migrator.js": "823fc1c204003a4a782e23b1a0781b9ee48d2865004a8acb73359777c0c067bc",
+        "settings_structure.js": "76520793fad024750498529f19c830819b5d9e3b0ab6aa408caaf32c0c7b2000"
+    }
 }
 }

+ 3 - 2
module.json

@@ -3,7 +3,7 @@
     "author": "Caali / Pinkie Pie / m0py / Snug / beng",
     "author": "Caali / Pinkie Pie / m0py / Snug / beng",
     "description": "Removes the annoying animation and skips the progress bar for enchanting, upgrading, soulbinding, dismantling, and merging items.",
     "description": "Removes the annoying animation and skips the progress bar for enchanting, upgrading, soulbinding, dismantling, and merging items.",
     "version": "1.0",
     "version": "1.0",
-    "servers": ["https://raw.githubusercontent.com/tera-toolbox-mods/instant-everything/master/"],
+    "servers": ["https://raw.githubusercontent.com/tera-private-mods/instant-everything/master/"],
     "options": {
     "options": {
         "cliName": "InstantEverything",
         "cliName": "InstantEverything",
         "guiName": "InstantEverything",
         "guiName": "InstantEverything",
@@ -11,5 +11,6 @@
         "settingsFile": "config.json",
         "settingsFile": "config.json",
         "settingsMigrator": "settings_migrator.js"
         "settingsMigrator": "settings_migrator.js"
     },
     },
-    "conflicts": ["instant-enchant", "instant-upgrade", "instant-soulbind", "instant-dismantle", "instant-merge"]
+    "conflicts": ["instant-enchant","instant-upgrade","instant-soulbind","instant-dismantle","instant-merge"],
+    "disableAutoUpdate": false
 }
 }