Merge branch 'Develop' into professorbunbury-sw5e

Browse source

...

This commit is contained in:

CK 2020-12-11 13:40:18 -05:00 • committed by GitHub

parent 14e9b0c341 d679d79e99

commit b383a5a382

No known key found for this signature in database

GPG key ID: 4AEE18F83AFDEB23

10 changed files with 658 additions and 1473 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

0

packs/Icons/Simple Blasters/Holdout Blaster.webp → packs/Icons/Simple Blasters/Hold-Out.webp

Unescape Escape View file

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

BIN

packs/Icons/Simple Blasters/Wristblaster.webp Normal file

View file

Binary file not shown.

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

1

packs/packs/classes.db

View file

File diff suppressed because one or more lines are too long

796

packs/packs/items.db

View file

File diff suppressed because one or more lines are too long