Upstream
/
WorldSystem
mirror of https://github.com/trainerlord/WorldSystem.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dependabot/npm_and_yarn/husky-4.3.0

This commit is contained in:
trainerlord 2020-09-15 11:44:43 -04:00 committed by GitHub
parent 74c24e79c8 55e6671f29
commit 21a393450c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
plugins {
id 'com.github.johnrengelman.shadow' version '6.0.0'
id 'kr.entree.spigradle' version '2.1.2'
id 'kr.entree.spigradle' version '2.2.3'
id 'java'
id 'jacoco'
}
@ -173,7 +173,7 @@ dependencies {
compileOnly 'me.clip:placeholderapi:2.10.9'
compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
compileOnly 'com.mojang:authlib:1.5.25'
compileOnly 'org.projectlombok:lombok:1.18.4'
compileOnly 'org.projectlombok:lombok:1.18.12'
compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT'
compileOnly 'com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT'
compile files('C:/Users/train/Desktop/Programing/Git/worldsystem/lib/commons-io-2.7.jar')

2
package.json
View File

@ -3,7 +3,7 @@
"@semantic-release/changelog": "5.0.1",
"@semantic-release/commit-analyzer": "8.0.1",
"@semantic-release/git": "9.0.0",
"@semantic-release/github": "7.0.7",
"@semantic-release/github": "7.1.1",
"@semantic-release/release-notes-generator": "9.0.1",
"commitlint": "9.1.2",
"conventional-changelog-conventionalcommits": "4.4.0",

37
yarn.lock
View File

@ -335,10 +335,10 @@
micromatch "^4.0.0"
p-reduce "^2.0.0"
"@semantic-release/github@7.0.7", "@semantic-release/github@^7.0.0":
version "7.0.7"
resolved "https://registry.yarnpkg.com/@semantic-release/github/-/github-7.0.7.tgz#e3999b06433d08871acd68ecec2b4e212c05d09f"
integrity sha512-Sai2UucYQ+5rJzKVEVJ4eiZNDdoo0/CzfpValBdeU5h97uJE7t4CoBTmUWkiXlPOx46CSw1+JhI+PHC1PUxVZw==
"@semantic-release/github@7.1.1", "@semantic-release/github@^7.0.0":
version "7.1.1"
resolved "https://registry.yarnpkg.com/@semantic-release/github/-/github-7.1.1.tgz#e998aa9a9cd770838d9f27c64f060c2b686b9d95"
integrity sha512-w8CLCvGVKNe2FPOYQ68OFxFVNNha7YRzptnwTZYdjXYtgTDKw0XVfnMSd9NlJeQPYGfQmIhIVPNBU/cA6zUY0A==
dependencies:
"@octokit/rest" "^17.0.0"
"@semantic-release/error" "^2.2.0"
@ -1899,10 +1899,10 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
gradle-semantic-release-plugin@1.4.8:
version "1.4.8"
resolved "https://registry.yarnpkg.com/gradle-semantic-release-plugin/-/gradle-semantic-release-plugin-1.4.8.tgz#bd3609949d79b1c239a4522531fa3b46e8ed10da"
integrity sha512-/FyjF1iASUKxHegNdNMd8+clXWznYPcQdE90XshEbRGP3B8n8iDktsykLHJse6Dztn6f1A/HjNvAPZxfCrbPjA==
gradle-semantic-release-plugin@1.4.9:
version "1.4.9"
resolved "https://registry.yarnpkg.com/gradle-semantic-release-plugin/-/gradle-semantic-release-plugin-1.4.9.tgz#941fec5968c378ab61f315368e4e6964a2506117"
integrity sha512-R8FzDVfy70H7oYqHFP3YvnMCISZHcHsEVTHuLAEMDYNurrNs+gkLR2VdnhU6CAX0xJFZWGnJhhbCdr2btLGnZQ==
dependencies:
promisified-properties "^2.0.3"
split2 "^3.1.1"
@ -2603,10 +2603,10 @@ lines-and-columns@^1.1.6:
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
lint-staged@10.2.13:
version "10.2.13"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.2.13.tgz#b9c504683470edfc464b7d3fe3845a5a1efcd814"
integrity sha512-conwlukNV6aL9SiMWjFtDp5exeDnTMekdNPDZsKGnpfQuHcO0E3L3Bbf58lcR+M7vk6LpCilxDAVks/DDVBYlA==
lint-staged@10.3.0:
version "10.3.0"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.3.0.tgz#388c3d440590c45c339e7163f669ea69ae90b1e0"
integrity sha512-an3VgjHqmJk0TORB/sdQl0CTkRg4E5ybYCXTTCSJ5h9jFwZbcgKIx5oVma5e7wp/uKt17s1QYFmYqT9MGVosGw==
dependencies:
chalk "^4.1.0"
cli-truncate "^2.1.0"
@ -2822,12 +2822,7 @@ lodash.without@~4.4.0:
resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=
lodash@^4.17.15, lodash@^4.17.4:
version "4.17.19"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
lodash@^4.17.19:
lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4:
version "4.17.20"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@ -3143,9 +3138,9 @@ node-fetch-npm@^2.0.2:
safe-buffer "^5.1.1"
node-fetch@^2.3.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
version "2.6.1"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
node-gyp@^5.0.2, node-gyp@^5.1.0:
version "5.1.1"