expand/ccashbot
1
0
Fork 0
mirror of https://github.com/Expand-sys/ccashbot synced 2025-12-16 23:52:14 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

fug

Browse source
This commit is contained in:
Expand-sys 2021-07-02 13:36:36 +10:00
parent 7df07f7aae
commit e0d87bd0d2
2 changed files with 18 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
package-lock.json generated
View file

@ -20,12 +20,9 @@
"minecraft-server-util": "^3.5.2",
"moment": "^2.29.1",
"node-fetch": "^2.6.1",
<<<<<<< HEAD
"quick.db": "^7.1.3",
"rcon-client": "^4.2.3",
"request-promise-cache": "^2.0.1",
=======
"quick.db": "^7.1.3",
>>>>>>> 81b54603c198c2ad668af9d39ab97e759193dbcd
"superagent": "^6.1.0",
"unirest": "^0.6.0"
}
@ -1442,7 +1439,6 @@
"node": ">=4"
}
},
<<<<<<< HEAD
"node_modules/minecraft-server-util": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/minecraft-server-util/-/minecraft-server-util-3.5.2.tgz",
@ -1465,7 +1461,6 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
=======
"node_modules/minimist": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
@ -1510,7 +1505,6 @@
"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
},
>>>>>>> 81b54603c198c2ad668af9d39ab97e759193dbcd
"node_modules/moment": {
"version": "2.29.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
@ -1872,14 +1866,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
<<<<<<< HEAD
"node_modules/rcon-client": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/rcon-client/-/rcon-client-4.2.3.tgz",
"integrity": "sha512-g+DEzI3O0Nl4Y3mPp6DHhSpYeiv+wTq8iKxCumFGO0/SMCsdNfx9bpT5RyHa7phR5dvspKfQK0ZYJp1YCtXNng==",
"dependencies": {
"typed-emitter": "^0.1.0"
=======
"node_modules/quick.db": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/quick.db/-/quick.db-7.1.3.tgz",
@ -1903,6 +1889,14 @@
"rc": "cli.js"
}
},
"node_modules/rcon-client": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/rcon-client/-/rcon-client-4.2.3.tgz",
"integrity": "sha512-g+DEzI3O0Nl4Y3mPp6DHhSpYeiv+wTq8iKxCumFGO0/SMCsdNfx9bpT5RyHa7phR5dvspKfQK0ZYJp1YCtXNng==",
"dependencies": {
"typed-emitter": "^0.1.0"
}
},
"node_modules/readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@ -1915,7 +1909,6 @@
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
>>>>>>> 81b54603c198c2ad668af9d39ab97e759193dbcd
}
},
"node_modules/readable-web-to-node-stream": {
@ -2165,11 +2158,6 @@
"safer-buffer": "^2.0.2",
"tweetnacl": "~0.14.0"
},
"bin": {
"sshpk-conv": "bin/sshpk-conv",
"sshpk-sign": "bin/sshpk-sign",
"sshpk-verify": "bin/sshpk-verify"
},
"engines": {
"node": ">=0.10.0"
}
@ -3671,7 +3659,6 @@
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
},
<<<<<<< HEAD
"minecraft-server-util": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/minecraft-server-util/-/minecraft-server-util-3.5.2.tgz",
@ -3687,7 +3674,6 @@
}
}
},
=======
"minimist": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
@ -3720,7 +3706,6 @@
"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
},
>>>>>>> 81b54603c198c2ad668af9d39ab97e759193dbcd
"moment": {
"version": "2.29.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
@ -3988,14 +3973,6 @@
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
},
<<<<<<< HEAD
"rcon-client": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/rcon-client/-/rcon-client-4.2.3.tgz",
"integrity": "sha512-g+DEzI3O0Nl4Y3mPp6DHhSpYeiv+wTq8iKxCumFGO0/SMCsdNfx9bpT5RyHa7phR5dvspKfQK0ZYJp1YCtXNng==",
"requires": {
"typed-emitter": "^0.1.0"
=======
"quick.db": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/quick.db/-/quick.db-7.1.3.tgz",
@ -4016,6 +3993,14 @@
"strip-json-comments": "~2.0.1"
}
},
"rcon-client": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/rcon-client/-/rcon-client-4.2.3.tgz",
"integrity": "sha512-g+DEzI3O0Nl4Y3mPp6DHhSpYeiv+wTq8iKxCumFGO0/SMCsdNfx9bpT5RyHa7phR5dvspKfQK0ZYJp1YCtXNng==",
"requires": {
"typed-emitter": "^0.1.0"
}
},
"readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@ -4028,7 +4013,6 @@
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
>>>>>>> 81b54603c198c2ad668af9d39ab97e759193dbcd
}
},
"readable-web-to-node-stream": {

5
package.json
View file

@ -24,12 +24,9 @@
"minecraft-server-util": "^3.5.2",
"moment": "^2.29.1",
"node-fetch": "^2.6.1",
<<<<<<< HEAD
"quick.db": "^7.1.3",
"rcon-client": "^4.2.3",
"request-promise-cache": "^2.0.1",
=======
"quick.db": "^7.1.3",
>>>>>>> 81b54603c198c2ad668af9d39ab97e759193dbcd
"superagent": "^6.1.0",
"unirest": "^0.6.0"
}