Commit 7f6760dc authored by nanahira's avatar nanahira

Merge branch 'master' of ../srvpro into develop

parents c3621213 9de7c60b
Pipeline #43083 passed with stages
in 12 minutes and 36 seconds
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"underscore.string": "^3.3.6", "underscore.string": "^3.3.6",
"ws": "^8.9.0", "ws": "^8.9.0",
"ygopro-deck-encode": "^1.0.15", "ygopro-deck-encode": "^1.0.15",
"ygopro-msg-encode": "^1.1.6", "ygopro-msg-encode": "^1.1.8",
"ygopro-yrp-encode": "^1.0.1" "ygopro-yrp-encode": "^1.0.1"
}, },
"devDependencies": { "devDependencies": {
...@@ -1447,6 +1447,7 @@ ...@@ -1447,6 +1447,7 @@
"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.6.1.tgz", "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.6.1.tgz",
"integrity": "sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==", "integrity": "sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@ioredis/commands": "^1.1.1", "@ioredis/commands": "^1.1.1",
"cluster-key-slot": "^1.1.0", "cluster-key-slot": "^1.1.0",
...@@ -3025,9 +3026,9 @@ ...@@ -3025,9 +3026,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/ygopro-msg-encode": { "node_modules/ygopro-msg-encode": {
"version": "1.1.6", "version": "1.1.8",
"resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.6.tgz", "resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.8.tgz",
"integrity": "sha512-ViNMcSM5o32zW0GhaPgXCQSz8hJJ/4Nd5HPQVRA6o9qqZ+2+0tjLZX8vviMA48iFmsA03ABTx6Y5iT8h1e11jQ==", "integrity": "sha512-KrGUuyRLftmiD51KNRs/IRInsw+Xz/ISlCTmg+2W+6VLD6MtO9qF9SgBI78tXJ4/zsxifYekSDYfMuzJf2PuUA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"typed-reflector": "^1.0.14", "typed-reflector": "^1.0.14",
...@@ -4066,6 +4067,7 @@ ...@@ -4066,6 +4067,7 @@
"version": "5.6.1", "version": "5.6.1",
"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.6.1.tgz", "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.6.1.tgz",
"integrity": "sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==", "integrity": "sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==",
"peer": true,
"requires": { "requires": {
"@ioredis/commands": "^1.1.1", "@ioredis/commands": "^1.1.1",
"cluster-key-slot": "^1.1.0", "cluster-key-slot": "^1.1.0",
...@@ -5260,9 +5262,9 @@ ...@@ -5260,9 +5262,9 @@
"integrity": "sha512-NMvgWuC3SKant50RDu0bHa3QIRlwBhdTR3bNDrMpNthTTQmCCq8i2HZaWFiCmYIBi9fR3W9CkFIgK6hI4d+PzQ==" "integrity": "sha512-NMvgWuC3SKant50RDu0bHa3QIRlwBhdTR3bNDrMpNthTTQmCCq8i2HZaWFiCmYIBi9fR3W9CkFIgK6hI4d+PzQ=="
}, },
"ygopro-msg-encode": { "ygopro-msg-encode": {
"version": "1.1.6", "version": "1.1.8",
"resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.6.tgz", "resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.8.tgz",
"integrity": "sha512-ViNMcSM5o32zW0GhaPgXCQSz8hJJ/4Nd5HPQVRA6o9qqZ+2+0tjLZX8vviMA48iFmsA03ABTx6Y5iT8h1e11jQ==", "integrity": "sha512-KrGUuyRLftmiD51KNRs/IRInsw+Xz/ISlCTmg+2W+6VLD6MtO9qF9SgBI78tXJ4/zsxifYekSDYfMuzJf2PuUA==",
"requires": { "requires": {
"typed-reflector": "^1.0.14", "typed-reflector": "^1.0.14",
"ygopro-deck-encode": "^1.0.15", "ygopro-deck-encode": "^1.0.15",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment