Skip to content

Commit 09f991a

Browse files
OedonFormlessOedonFormless
authored
Merge branch 'Roll20:master' into coc_v.4.0.0
2 parents 534c8d5 + 20e07aa commit 09f991a

File tree

3,205 files changed

+1012263
-197010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,205 files changed

+1012263
-197010
lines changed

‎.actions/sheet-checks/package-lock.json‎

Lines changed: 628 additions & 355 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.actions/sheet-checks/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@types/node": "^20.8.9",
1515
"jest-diff": "^29.7.0",
1616
"typescript": "^5.2.2",
17-
"vitest": "^2.1.5"
17+
"vitest": "^3.0.7"
1818
},
1919
"dependencies": {
2020
"@actions/core": "^1.10.1",

‎.actions/sheet-http/README.md‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# Note
2-
As this code is exactly the same as the code in the private character sheet repo
3-
We are using that repo as the source for the uncompiled versio of this code
1+
# Dependencies
42

3+
* You will need to install the correct asdf node js listed in the root of this repo's .tools-version file
4+
* Then you will need to run `npm i -g @vercel/ncc`
5+
* Then run `npm run build`
6+
7+
NOTE: You will need to run `npm run build` and commit that change every time you make file changes
8+
in `index.ts`
9+
10+
Raw source code of this is in roll20 private repo. This is just a compiled version.

‎.actions/sheet-http/action.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ inputs:
77
default: '::'
88
credentials:
99
required: true
10+
run-all:
11+
default: false
12+
simulate:
13+
default: false
1014

1115
runs:
1216
using: 'node20'

‎.actions/sheet-http/dist/index.js‎

Lines changed: 11308 additions & 7648 deletions
Large diffs are not rendered by default.

‎.github/pull_request_template.md‎

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,53 @@
1-
<!-- ATTENTION: This Pull Request template changed on 03/17/22. Please ensure that you are completing this template to the fullest extent possible. -->
1+
<!-- ATTENTION: This Pull Request template changed on 2025 04 03. Please ensure that you are completing this template to the fullest extent possible. -->
22

33
# Submission Checklist
4-
## Required
54

6-
<!-- Check these off by adding an 'x' to each of these boxes. If you fail to meet all these criteria, your PR will be rejected. -->
5+
> [!WARNING]
6+
> Submission Checklist
7+
> Failure to complete this checklist in its entirety will result in your Pull Request being dismissed. _Deleting parts of this template (except the new sheet section for existing sheets) counts as failure to complete it_. If you have any questions, please feel free to create an issue.
8+
9+
> [!NOTE]
10+
> Draft Pull Requests
11+
> If you are unclear about any of the rules regarding the creation of character sheets, or need assistance from the Roll20 team, please feel free to create a Draft PR and request feedback. We'd much rather provide assistance than reject a PR.
12+
13+
<!-- Check these off by replacing the empty space with an 'x' in each of these boxes. If you fail to meet all these criteria, your PR will be rejected. -->
14+
15+
## Pull Request Title
16+
17+
Please format your pull request in the following way: `[Sheet Name] Change Type: Description`. For example: `[D&D5e] New Feature: Adding dragons to dungeons`.
718

819
- [ ] The pull request title clearly contains the name of the sheet I am editing.
920
- [ ] The pull request title clearly states the type of change I am submitting (New Sheet/New Feature/Bugfix/etc.).
21+
22+
## Pull Request Content
23+
1024
- [ ] The pull request makes changes to files in only one sub-folder.
1125
- [ ] The pull request does not contain changes to any json files in the translations folder (translation.json is permitted)
26+
- [ ] The pull request does not, _without express prior permission from affected parties_, include any material that could be considered to infringe on a Publisher's intellectual property rights, such as logos, images, rules text or other rules content.
1227

1328
## New Sheet Details
1429

15-
<!-- If you are submitting a new sheet to the repository, please fill in any empty spaces indicated by < >. -->
16-
17-
- The name of this game is: < > _(i.e. Dungeons & Dragons 5th Edition, The Dresden Files RPG)_
18-
- The publisher of this game is: < > _(i.e. Wizards of the Coast, Evil Hat)_
19-
- The name of this game system/family is: < > _(i.e. Dungeons & Dragons, FATE)_
30+
Please complete this section if you are adding a new sheet to the repository.
2031

21-
- [ ] I have followed the [Character Sheets Standards](https://wiki.roll20.net/Building_Character_Sheets#Roll20_Character_Sheets_Repository) when building this sheet.
32+
If you are submitting a new sheet to the repository, please fill in any empty spaces indicated by [ ].
2233

23-
<!-- Please check any that apply: -->
34+
- The name of this game is: [ ]
35+
> _(e.g. Dungeons & Dragons 5th Edition, The Dresden Files RPG)_
36+
- The publisher of this game is: [ ]
37+
> _(e.g. Wizards of the Coast, Evil Hat)_
38+
- The name of this game system/family is: [ ]
39+
> _(e.g. Dungeons & Dragons, FATE)_
40+
- The rules for this game can be found at the following location: [ ]
41+
> _(e.g. a link to purchase, ISBN, Half-Price Books)_
2442
43+
- [ ] I have followed the [Character Sheets Standards](https://wiki.roll20.net/Building_Character_Sheets#Roll20_Character_Sheets_Repository) when building this sheet.
2544
- [ ] I have authorization from the game's publisher to make this an official sheet on Roll20 with their name attached.
26-
- [ ] This game is not a traditionally published game, but a copy of the game rules can be purchased/downloaded/found at: < >
27-
- [ ] This sheet is for an unofficial fan game, modification to an existing game, or a homebrew system.
45+
46+
Select EXACTLY One:
47+
- [ ] This game is a traditionally published game.
48+
- [ ] This game is not a traditionally published game.
49+
- [ ] This sheet is for an unofficial fan game, modification to an existing game, or a homebrew system. [ ADD DETAILS HERE ]
2850

2951
# Changes / Description
3052

3153
<!-- This is an optional step, but detailing the nature of the changes makes it easier for other contributors to track down bugs and fix issues -->
32-
33-
34-
35-

‎.github/workflows/charsheet-actions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fetch-depth: 0
1414
- name: Get changed files
1515
id: changed-files
16-
uses: tj-actions/changed-files@v41
16+
uses: tj-actions/changed-files@v46.0.1
1717
with:
1818
since_last_remote_commit: true
1919
separator: '::'

‎.github/workflows/sheet-checks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fetch-depth: 0
1616
- name: Get changed files
1717
id: changed-files
18-
uses: tj-actions/changed-files@v45
18+
uses: tj-actions/changed-files@v46.0.1
1919
with:
2020
since_last_remote_commit: true
2121
separator: "SEPARATEMYCHECKEDFILES"
@@ -32,4 +32,4 @@ jobs:
3232
TAVERN_API_KEY: ${{ secrets.TAVERN_API_KEY }}
3333
STAGING_API_KEY: ${{ secrets.STAGING_API_KEY }}
3434
PRODUCTION_API_KEY: ${{ secrets.PRODUCTION_API_KEY }}
35-
ACTIONS_STEP_DEBUG: true
35+
ACTIONS_STEP_DEBUG: true

‎.github/workflows/sheet-http-actions-all.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Sheet HTTP Actions All
2+
3+
on: workflow_dispatch
4+
jobs:
5+
update-sheet-http:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v4.1.1
9+
- uses: ./.actions/sheet-http
10+
with:
11+
file-list: ${{ needs.get-list.outputs.file-list }}
12+
separator: "::"
13+
credentials: ${{ secrets.SERVICE_ACCOUNT_KEY }}
14+
run-all: true
15+
env:
16+
TAVERN_API_KEY: ${{ secrets.TAVERN_API_KEY }}
17+
TAVERN_TOKEN: ${{ secrets.TAVERN_TOKEN }}
18+
STAGING_API_KEY: ${{ secrets.STAGING_API_KEY }}
19+
PRODUCTION_API_KEY: ${{ secrets.PRODUCTION_API_KEY }}

‎.github/workflows/sheet-http-actions-sim-all.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Sheet HTTP Action Simulate All
2+
3+
on: workflow_dispatch
4+
jobs:
5+
update-sheet-http:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v4.1.1
9+
- uses: ./.actions/sheet-http
10+
with:
11+
file-list: ${{ needs.get-list.outputs.file-list }}
12+
separator: "::"
13+
credentials: ${{ secrets.SERVICE_ACCOUNT_KEY }}
14+
run-all: true
15+
simulate: true
16+
env:
17+
TAVERN_API_KEY: ${{ secrets.TAVERN_API_KEY }}
18+
TAVERN_TOKEN: ${{ secrets.TAVERN_TOKEN }}
19+
STAGING_API_KEY: ${{ secrets.STAGING_API_KEY }}
20+
PRODUCTION_API_KEY: ${{ secrets.PRODUCTION_API_KEY }}

0 commit comments

Comments
 (0)