Skip to content

Commit

Permalink
Add license files to included fonts. Adjust CONTRIBUTING.md and READM…
Browse files Browse the repository at this point in the history
…E.md. Fix being unable to reorder spell slot favourites.
  • Loading branch information
Fyorl committed Jan 26, 2024
1 parent 0dd800c commit 4f8e1fd
Show file tree
Hide file tree
Showing 17 changed files with 496 additions and 19 deletions.
8 changes: 2 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ Runs the LESS -> CSS builder in watch mode so that changes made to the LESS file

This repository includes some utilities which allow the Compendia included in the System to be maintained as JSON files. This makes contributions which include changes to the compendia considerably easier to review.

Please remember to compile any pack whose JSON your contribution touches before submitting an PR.

#### Compiling Packs

Compile the source JSON files into compendium packs.
Expand Down Expand Up @@ -97,8 +95,6 @@ If there is missing content, please open an issue detailing what is missing.

In general, content contributions will take the shape of fixing typos or bugs in the configuration of the existing items in the included compendia JSON files, which are then compiled into the appropriate db file.

Every PR which contributes content must change both the source JSON file and the db file.

### Translations

Non-English languages are not contained within the core dnd5e system, but instead they are managed by specialized [localization modules](https://foundryvtt.com/packages/tag/translation).
Expand Down Expand Up @@ -182,6 +178,6 @@ https://github.com/foundryvtt/dnd5e/releases/download/release-1.6.3/dnd5e-1.6.3.

0. [ ] Verify the `NEEDS_MIGRATION_VERSION` is correct.
1. [ ] `system.json` `version` and `download` fields are updated on the development branch (e.g. `1.5.x`).
2. [ ] A Tag is created at the tip of the development branch with the format `release-x.x.x`, triggering the CI workflow (which takes ~2 mins to complete).
2. [ ] A tag is created at the tip of the development branch with the format `release-x.x.x`, triggering the CI workflow (which takes ~2 mins to complete).
3. [ ] Development Branch is merged to `master` after the workflow is completed.
4. [ ] The Foundryvtt.com admin listing is updated with the `manifest` url pointing to the `system.json` attached to the workflow-created release.
4. [ ] The foundryvtt.com admin listing is updated with the `manifest` url pointing to the `system.json` attached to the workflow-created release.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Features, and more!

This work includes material taken from the System Reference Document 5.1 ("SRD 5.1") by Wizards of the Coast LLC and available at https://dnd.wizards.com/resources/systems-reference-document. The SRD 5.1 is licensed under the Creative Commons Attribution 4.0 International License available at https://creativecommons.org/licenses/by/4.0/legalcode.

Images present under the `icons/` directory are distributed under various terms, please see the `icons/LICENSE` file for full details.
Images and other assets are distributed under various terms, please see their `LICENSE` files for full details.

The software component of this system is distributed under the MIT license.

Expand All @@ -22,7 +22,7 @@ To install and use the DnD5e system for Foundry Virtual Tabletop, simply paste t

https://raw.githubusercontent.com/foundryvtt/dnd5e/master/system.json

If you wish to manually install the system, you must clone or extract it into the ``Data/systems/dnd5e`` folder. You
If you wish to manually install the system, you must clone or extract it into the `Data/systems/dnd5e` folder. You
may do this by cloning the repository or downloading a zip archive from the
[Releases Page](https://github.com/foundryvtt/dnd5e/releases).

Expand Down
23 changes: 13 additions & 10 deletions dnd5e.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -264,26 +264,29 @@ function _configureFonts() {
Roboto: {
editor: true,
fonts: [
{ urls: ["systems/dnd5e/fonts/Roboto-Regular.woff2"] },
{ urls: ["systems/dnd5e/fonts/Roboto-Bold.woff2"], weight: "bold" },
{ urls: ["systems/dnd5e/fonts/Roboto-Italic.woff2"], style: "italic" },
{ urls: ["systems/dnd5e/fonts/Roboto-BoldItalic.woff2"], weight: "bold", style: "italic" }
{ urls: ["systems/dnd5e/fonts/roboto/Roboto-Regular.woff2"] },
{ urls: ["systems/dnd5e/fonts/roboto/Roboto-Bold.woff2"], weight: "bold" },
{ urls: ["systems/dnd5e/fonts/roboto/Roboto-Italic.woff2"], style: "italic" },
{ urls: ["systems/dnd5e/fonts/roboto/Roboto-BoldItalic.woff2"], weight: "bold", style: "italic" }
]
},
"Roboto Condensed": {
editor: true,
fonts: [
{ urls: ["systems/dnd5e/fonts/RobotoCondensed-Regular.woff2"] },
{ urls: ["systems/dnd5e/fonts/RobotoCondensed-Bold.woff2"], weight: "bold" },
{ urls: ["systems/dnd5e/fonts/RobotoCondensed-Italic.woff2"], style: "italic" },
{ urls: ["systems/dnd5e/fonts/RobotoCondensed-BoldItalic.woff2"], weight: "bold", style: "italic" }
{ urls: ["systems/dnd5e/fonts/roboto-condensed/RobotoCondensed-Regular.woff2"] },
{ urls: ["systems/dnd5e/fonts/roboto-condensed/RobotoCondensed-Bold.woff2"], weight: "bold" },
{ urls: ["systems/dnd5e/fonts/roboto-condensed/RobotoCondensed-Italic.woff2"], style: "italic" },
{
urls: ["systems/dnd5e/fonts/roboto-condensed/RobotoCondensed-BoldItalic.woff2"], weight: "bold",
style: "italic"
}
]
},
"Roboto Slab": {
editor: true,
fonts: [
{ urls: ["systems/dnd5e/fonts/RobotoSlab-Regular.ttf"] },
{ urls: ["systems/dnd5e/fonts/RobotoSlab-Bold.ttf"], weight: "bold" }
{ urls: ["systems/dnd5e/fonts/roboto-slab/RobotoSlab-Regular.ttf"] },
{ urls: ["systems/dnd5e/fonts/roboto-slab/RobotoSlab-Bold.ttf"], weight: "bold" }
]
}
});
Expand Down
93 changes: 93 additions & 0 deletions fonts/roboto-condensed/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2011 The Roboto Project Authors (https://github.com/googlefonts/roboto-classic)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://openfontlicense.org


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 4f8e1fd

Please sign in to comment.