Merge branch 'master' into professorbunbury-sw5e

Browse source

...

This commit is contained in:

Kakeman89 2020-10-30 11:36:29 -04:00

parent 18a28217c1 d3801930df

commit dd0d207149

477 changed files with 840 additions and 716 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

packs/Icons/monsters/228_-_Officer_2C_Senior/Admiral Strife.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 28 KiB

0

packs/Icons/monsters/263_-_Vessel_of_Abeloth/avatar.webp → packs/Icons/monsters/263_-_Avatar_of_Abeloth/avatar.webp

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 131 KiB After Width:  |  Height:  |  Size: 131 KiB

0

packs/Icons/monsters/263_-_Vessel_of_Abeloth/token.webp → packs/Icons/monsters/263_-_Avatar_of_Abeloth/token.webp

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 19 KiB

0

packs/Icons/monsters/390_-_Dark_Student/avatar.webp → packs/Icons/monsters/390_-_Dark_Acolyte/avatar.webp

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 41 KiB After Width:  |  Height:  |  Size: 41 KiB

0

packs/Icons/monsters/390_-_Dark_Student/token.webp → packs/Icons/monsters/390_-_Dark_Acolyte/token.webp

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

0

packs/Icons/monsters/403_-_Dark_Acolyte/avatar.webp → packs/Icons/monsters/403_-_Dark_Disciple/avatar.webp

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 62 KiB After Width:  |  Height:  |  Size: 62 KiB

0

packs/Icons/monsters/403_-_Dark_Acolyte/token.webp → packs/Icons/monsters/403_-_Dark_Disciple/token.webp

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB