Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
Auxilor 2020-10-29 13:06:16 +00:00
commit 548a6fe01d

View File

@ -20,6 +20,12 @@ You are not allowed to redistribute full, partial or modified versions of the pa
is associated. This license does not apply to modules or extensions that use but do not contain full, is associated. This license does not apply to modules or extensions that use but do not contain full,
partial or modified code from this package. partial or modified code from this package.
By purchasing the package from the offical distributor (spigotmc.org) you agree to the following terms:
1. No refunds, under any circumstance, unless explicitly approved by the copyright holder.
2. You are of legal age and/or have permission from your legal guardian.
## ECOENCHANTS LICENSE ## ECOENCHANTS LICENSE
### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@ -33,4 +39,4 @@ Holder's permission.
to the package as long as you don't use it as a way to circumvent the restrictions of the license. to the package as long as you don't use it as a way to circumvent the restrictions of the license.
4. By proposing a modification you agree to assign all your rights on your code to the Copyright Holder. 4. By proposing a modification you agree to assign all your rights on your code to the Copyright Holder.
You must therefore own the modifications you propose or have the permission to assign their rights. You must therefore own the modifications you propose or have the permission to assign their rights.