Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
carolinaisslaying committed Jan 24, 2025
2 parents b55684b + f801734 commit ce2ce5a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
matrix:
# Use these Java versions
java: [
17,
21, # Current Java LTS
]
runs-on: ubuntu-22.04
Expand All @@ -34,4 +35,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: Artifacts
path: build/libs/
path: build/libs/
2 changes: 1 addition & 1 deletion ASSETS_LICENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ In this licence, unless the context otherwise requires,—

# 2 General provisions

(a) Everything within this software is covered under the AGPL-3.0 licence, except as provided herein.
(a) Everything within this software is covered under the [AGPL-3.0 licence](https://github.com/carolinaisslaying/CarolinasTweaks/blob/main/LICENCE.md), except as provided herein.

(b) All assets, except as further provided herein are works of Carolina Mitchell licenced under
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/?ref=chooser-v1" target="_blank" rel="license noopener noreferrer" style="display:inline-block;">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International<img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg?ref=chooser-v1" alt=""><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/by.svg?ref=chooser-v1" alt=""><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/nc.svg?ref=chooser-v1" alt=""><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/sa.svg?ref=chooser-v1" alt=""></a></p>
Expand Down

0 comments on commit ce2ce5a

Please sign in to comment.