Merge branch 'main' into misc2
11
.github/workflows/deploy.yml
vendored
@ -28,11 +28,6 @@ jobs:
|
|||||||
ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
|
ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
|
||||||
- name: Deploy build on server
|
- name: Deploy build on server
|
||||||
if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
|
if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
|
||||||
run: rsync -vrm dist/* ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DESTINATION_DIR }}
|
run: |
|
||||||
- name: Purge Cloudflare Cache
|
rsync --del -vrm dist/* ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DESTINATION_DIR }}
|
||||||
if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
|
ssh -t ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "~/prmanifest --inpath ${{ secrets.DESTINATION_DIR }} --outpath ${{ secrets.DESTINATION_DIR }}/manifest.json"
|
||||||
id: purge-cache
|
|
||||||
uses: NathanVaughn/actions-cloudflare-purge@v3.1.0
|
|
||||||
with:
|
|
||||||
cf_auth: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
|
||||||
cf_zone: ${{ secrets.CLOUDFLARE_ZONE_ID }}
|
|
||||||
|
1208
public/battle-anims/common-snap-trap.json
Normal file
@ -1069,8 +1069,6 @@
|
|||||||
"971",
|
"971",
|
||||||
"972",
|
"972",
|
||||||
"972",
|
"972",
|
||||||
"973",
|
|
||||||
"973",
|
|
||||||
"974",
|
"974",
|
||||||
"974",
|
"974",
|
||||||
"975",
|
"975",
|
||||||
@ -2203,8 +2201,6 @@
|
|||||||
"971b",
|
"971b",
|
||||||
"972b",
|
"972b",
|
||||||
"972b",
|
"972b",
|
||||||
"973b",
|
|
||||||
"973b",
|
|
||||||
"974b",
|
"974b",
|
||||||
"974b",
|
"974b",
|
||||||
"975b",
|
"975b",
|
||||||
@ -3335,8 +3331,6 @@
|
|||||||
"971sb",
|
"971sb",
|
||||||
"972sb",
|
"972sb",
|
||||||
"972sb",
|
"972sb",
|
||||||
"973sb",
|
|
||||||
"973sb",
|
|
||||||
"974sb",
|
"974sb",
|
||||||
"974sb",
|
"974sb",
|
||||||
"975sb",
|
"975sb",
|
||||||
@ -4474,8 +4468,6 @@
|
|||||||
"971s",
|
"971s",
|
||||||
"972s",
|
"972s",
|
||||||
"972s",
|
"972s",
|
||||||
"973s",
|
|
||||||
"973s",
|
|
||||||
"974s",
|
"974s",
|
||||||
"974s",
|
"974s",
|
||||||
"975s",
|
"975s",
|
||||||
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 12 KiB |
BIN
public/images/pokemon/icons/variant/1/31_1.png
Normal file
After Width: | Height: | Size: 771 B |
BIN
public/images/pokemon/icons/variant/1/35_2.png
Normal file
After Width: | Height: | Size: 577 B |
BIN
public/images/pokemon/icons/variant/1/36_2.png
Normal file
After Width: | Height: | Size: 698 B |
BIN
public/images/pokemon/icons/variant/1/69_3.png
Normal file
After Width: | Height: | Size: 473 B |
BIN
public/images/pokemon/icons/variant/1/70_3.png
Normal file
After Width: | Height: | Size: 654 B |
BIN
public/images/pokemon/icons/variant/1/71_3.png
Normal file
After Width: | Height: | Size: 785 B |
BIN
public/images/pokemon/icons/variant/1/83_2.png
Normal file
After Width: | Height: | Size: 930 B |
BIN
public/images/pokemon/icons/variant/1/83_3.png
Normal file
After Width: | Height: | Size: 837 B |
BIN
public/images/pokemon/icons/variant/2/197_2.png
Normal file
After Width: | Height: | Size: 563 B |
BIN
public/images/pokemon/icons/variant/2/197_3.png
Normal file
After Width: | Height: | Size: 589 B |
BIN
public/images/pokemon/icons/variant/3/280_2.png
Normal file
After Width: | Height: | Size: 360 B |
BIN
public/images/pokemon/icons/variant/3/280_3.png
Normal file
After Width: | Height: | Size: 360 B |
BIN
public/images/pokemon/icons/variant/3/281_2.png
Normal file
After Width: | Height: | Size: 436 B |
BIN
public/images/pokemon/icons/variant/3/281_3.png
Normal file
After Width: | Height: | Size: 436 B |
BIN
public/images/pokemon/icons/variant/3/282-mega_2.png
Normal file
After Width: | Height: | Size: 492 B |
BIN
public/images/pokemon/icons/variant/3/282-mega_3.png
Normal file
After Width: | Height: | Size: 492 B |
BIN
public/images/pokemon/icons/variant/3/282_2.png
Normal file
After Width: | Height: | Size: 471 B |
BIN
public/images/pokemon/icons/variant/3/282_3.png
Normal file
After Width: | Height: | Size: 471 B |
BIN
public/images/pokemon/icons/variant/3/285_3.png
Normal file
After Width: | Height: | Size: 467 B |
BIN
public/images/pokemon/icons/variant/3/286_3.png
Normal file
After Width: | Height: | Size: 785 B |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 3.3 KiB |
BIN
public/images/pokemon/icons/variant/3/351-rainy_1.png
Normal file
After Width: | Height: | Size: 550 B |
BIN
public/images/pokemon/icons/variant/3/351-snowy_1.png
Normal file
After Width: | Height: | Size: 629 B |
BIN
public/images/pokemon/icons/variant/3/351-sunny_1.png
Normal file
After Width: | Height: | Size: 591 B |
BIN
public/images/pokemon/icons/variant/3/374_2.png
Normal file
After Width: | Height: | Size: 550 B |
BIN
public/images/pokemon/icons/variant/3/374_3.png
Normal file
After Width: | Height: | Size: 546 B |
BIN
public/images/pokemon/icons/variant/3/375_2.png
Normal file
After Width: | Height: | Size: 775 B |
BIN
public/images/pokemon/icons/variant/3/375_3.png
Normal file
After Width: | Height: | Size: 793 B |
BIN
public/images/pokemon/icons/variant/3/376-mega_2.png
Normal file
After Width: | Height: | Size: 855 B |
BIN
public/images/pokemon/icons/variant/3/376-mega_3.png
Normal file
After Width: | Height: | Size: 916 B |
BIN
public/images/pokemon/icons/variant/3/376_2.png
Normal file
After Width: | Height: | Size: 858 B |
BIN
public/images/pokemon/icons/variant/3/376_3.png
Normal file
After Width: | Height: | Size: 888 B |
BIN
public/images/pokemon/icons/variant/3/475-mega_3.png
Normal file
After Width: | Height: | Size: 529 B |
BIN
public/images/pokemon/icons/variant/3/475_3.png
Normal file
After Width: | Height: | Size: 430 B |
BIN
public/images/pokemon/icons/variant/4/425_2.png
Normal file
After Width: | Height: | Size: 499 B |
BIN
public/images/pokemon/icons/variant/4/425_3.png
Normal file
After Width: | Height: | Size: 514 B |
BIN
public/images/pokemon/icons/variant/4/426_2.png
Normal file
After Width: | Height: | Size: 708 B |
BIN
public/images/pokemon/icons/variant/4/426_3.png
Normal file
After Width: | Height: | Size: 709 B |
BIN
public/images/pokemon/icons/variant/4/427_2.png
Normal file
After Width: | Height: | Size: 376 B |
BIN
public/images/pokemon/icons/variant/4/427_3.png
Normal file
After Width: | Height: | Size: 371 B |
BIN
public/images/pokemon/icons/variant/4/428-mega_2.png
Normal file
After Width: | Height: | Size: 463 B |
BIN
public/images/pokemon/icons/variant/4/428-mega_3.png
Normal file
After Width: | Height: | Size: 457 B |
BIN
public/images/pokemon/icons/variant/4/428_2.png
Normal file
After Width: | Height: | Size: 414 B |
BIN
public/images/pokemon/icons/variant/4/428_3.png
Normal file
After Width: | Height: | Size: 409 B |
BIN
public/images/pokemon/icons/variant/4/447_1.png
Normal file
After Width: | Height: | Size: 478 B |
BIN
public/images/pokemon/icons/variant/4/447_2.png
Normal file
After Width: | Height: | Size: 536 B |
BIN
public/images/pokemon/icons/variant/4/447_3.png
Normal file
After Width: | Height: | Size: 537 B |
BIN
public/images/pokemon/icons/variant/4/448-mega_1.png
Normal file
After Width: | Height: | Size: 659 B |
BIN
public/images/pokemon/icons/variant/4/448-mega_2.png
Normal file
After Width: | Height: | Size: 653 B |
BIN
public/images/pokemon/icons/variant/4/448-mega_3.png
Normal file
After Width: | Height: | Size: 661 B |
BIN
public/images/pokemon/icons/variant/4/448_1.png
Normal file
After Width: | Height: | Size: 501 B |
BIN
public/images/pokemon/icons/variant/4/448_2.png
Normal file
After Width: | Height: | Size: 506 B |
BIN
public/images/pokemon/icons/variant/4/448_3.png
Normal file
After Width: | Height: | Size: 498 B |
BIN
public/images/pokemon/icons/variant/4/475-mega_2.png
Normal file
After Width: | Height: | Size: 523 B |
BIN
public/images/pokemon/icons/variant/4/475_2.png
Normal file
After Width: | Height: | Size: 430 B |
BIN
public/images/pokemon/icons/variant/4/487-altered_2.png
Normal file
After Width: | Height: | Size: 950 B |
BIN
public/images/pokemon/icons/variant/4/487-altered_3.png
Normal file
After Width: | Height: | Size: 924 B |
BIN
public/images/pokemon/icons/variant/4/487-origin_2.png
Normal file
After Width: | Height: | Size: 779 B |
BIN
public/images/pokemon/icons/variant/4/487-origin_3.png
Normal file
After Width: | Height: | Size: 799 B |
BIN
public/images/pokemon/icons/variant/4/491_2.png
Normal file
After Width: | Height: | Size: 720 B |
BIN
public/images/pokemon/icons/variant/4/491_3.png
Normal file
After Width: | Height: | Size: 722 B |
BIN
public/images/pokemon/icons/variant/5/540_3.png
Normal file
After Width: | Height: | Size: 520 B |
BIN
public/images/pokemon/icons/variant/5/541_3.png
Normal file
After Width: | Height: | Size: 513 B |
BIN
public/images/pokemon/icons/variant/5/542_3.png
Normal file
After Width: | Height: | Size: 549 B |
BIN
public/images/pokemon/icons/variant/5/585-autumn_1.png
Normal file
After Width: | Height: | Size: 655 B |
BIN
public/images/pokemon/icons/variant/5/585-spring_1.png
Normal file
After Width: | Height: | Size: 650 B |
BIN
public/images/pokemon/icons/variant/5/585-summer_1.png
Normal file
After Width: | Height: | Size: 639 B |
BIN
public/images/pokemon/icons/variant/5/585-winter_1.png
Normal file
After Width: | Height: | Size: 653 B |
BIN
public/images/pokemon/icons/variant/5/586-autumn_1.png
Normal file
After Width: | Height: | Size: 829 B |
BIN
public/images/pokemon/icons/variant/5/586-spring_1.png
Normal file
After Width: | Height: | Size: 733 B |
BIN
public/images/pokemon/icons/variant/5/586-summer_1.png
Normal file
After Width: | Height: | Size: 708 B |
BIN
public/images/pokemon/icons/variant/5/586-winter_1.png
Normal file
After Width: | Height: | Size: 722 B |
BIN
public/images/pokemon/icons/variant/5/607_2.png
Normal file
After Width: | Height: | Size: 492 B |
BIN
public/images/pokemon/icons/variant/5/607_3.png
Normal file
After Width: | Height: | Size: 478 B |
BIN
public/images/pokemon/icons/variant/5/608_2.png
Normal file
After Width: | Height: | Size: 522 B |
BIN
public/images/pokemon/icons/variant/5/608_3.png
Normal file
After Width: | Height: | Size: 506 B |
BIN
public/images/pokemon/icons/variant/5/609_2.png
Normal file
After Width: | Height: | Size: 735 B |
BIN
public/images/pokemon/icons/variant/5/609_3.png
Normal file
After Width: | Height: | Size: 735 B |
BIN
public/images/pokemon/icons/variant/5/648-aria_2.png
Normal file
After Width: | Height: | Size: 602 B |
BIN
public/images/pokemon/icons/variant/5/648-aria_3.png
Normal file
After Width: | Height: | Size: 608 B |
BIN
public/images/pokemon/icons/variant/5/648-pirouette_2.png
Normal file
After Width: | Height: | Size: 676 B |
BIN
public/images/pokemon/icons/variant/5/648-pirouette_3.png
Normal file
After Width: | Height: | Size: 664 B |
BIN
public/images/pokemon/icons/variant/7/755_2.png
Normal file
After Width: | Height: | Size: 540 B |
BIN
public/images/pokemon/icons/variant/7/755_3.png
Normal file
After Width: | Height: | Size: 524 B |
BIN
public/images/pokemon/icons/variant/7/756_2.png
Normal file
After Width: | Height: | Size: 612 B |
BIN
public/images/pokemon/icons/variant/7/756_3.png
Normal file
After Width: | Height: | Size: 622 B |
BIN
public/images/pokemon/icons/variant/8/858-gigantamax_2.png
Normal file
After Width: | Height: | Size: 866 B |
BIN
public/images/pokemon/icons/variant/8/858-gigantamax_3.png
Normal file
After Width: | Height: | Size: 865 B |