mirror of
https://github.com/Pridecraft-Studios/joy.git
synced 2025-08-02 22:15:58 -04:00
Merge branch 'main' of https://github.com/Pridecraft-Studios/joy
This commit is contained in:
commit
db2cb6c211
10
LICENSE.md
10
LICENSE.md
@ -19,7 +19,7 @@ The core code was taken from [DaFuqs] and [hibiii] under the [Unlicense][BLAHAJ-
|
||||
|
||||
Pride Blahajs were taken from [musicalskele] under the [MIT License][BLAHAJ-PRIDE].
|
||||
|
||||
*Note: This is operating under assumptions from known and disclosed sources.*
|
||||
*Note: This is operating under assumptions from known and disclosed sources.*
|
||||
|
||||
## Assets
|
||||
|
||||
@ -27,14 +27,20 @@ Pride Blahajs were taken from [musicalskele] under the [MIT License][BLAHAJ-PRID
|
||||
|
||||
This does *NOT* include the music. See the [music license][MUSIC] for usage terms.
|
||||
|
||||
This also does *NOT* include brand assets, including the rosettes in `icon.png`, and `*_rosette.png`.
|
||||
These are All Rights Reserved.
|
||||
|
||||
## Music
|
||||
|
||||
[All Rights Reserved][MUSIC]. See the license file for details.
|
||||
|
||||
|
||||
[CODE]: LICENSE-CODE.md
|
||||
|
||||
[BLAHAJ-BASE]: LICENSE-BLAHAJ-BASE
|
||||
|
||||
[BLAHAJ-PRIDE]: LICENSE-BLAHAJ-PRIDE
|
||||
|
||||
[ASSETS]: LICENSE-ASSETS
|
||||
[MUSIC]: LICENSE-MUSIC
|
||||
|
||||
@ -42,4 +48,4 @@ This does *NOT* include the music. See the [music license][MUSIC] for usage term
|
||||
[hibiii]: https://github.com/hibiii/Blahaj
|
||||
[musicalskele]: https://github.com/musicalskele/blahaj
|
||||
|
||||
[Pride Pack]: https://git.pridecraft.gay/pridepack
|
||||
[Pride Pack]: https://git.pridecraft.gay/pridepack
|
||||
|
@ -66,6 +66,11 @@ Please read carefully; this affects how you may be able to use Joy's sources.
|
||||
|
||||
<p><a property="dct:title" rel="cc:attributionURL" href="https://pridecraft.gay/pridepack">Joy's Assets</a> by <a rel="cc:attributionURL dct:creator" property="cc:attributionName" href="https://pridecraft.gay">Pridecraft Studios</a> is licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/?ref=chooser-v1" target="_blank" rel="license noopener noreferrer" style="display:inline-block;">CC BY-SA 4.0<img width="16" height="16" style="height:16px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg?ref=chooser-v1" alt=""><img width="16" height="16" style="height:16px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/by.svg?ref=chooser-v1" alt=""><img width="16" height="16" style="height:16px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/sa.svg?ref=chooser-v1" alt=""></a></p>
|
||||
|
||||
This does *NOT* include the music. See the [music license][MUSIC] for usage terms.
|
||||
|
||||
This also does *NOT* include brand assets, including the rosettes in `icon.png`, and `*_rosette.png`.
|
||||
These are All Rights Reserved.
|
||||
|
||||
</details>
|
||||
|
||||
<details><summary>Music license [ARR + Permissions]</summary>
|
||||
|
Loading…
x
Reference in New Issue
Block a user