diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-08-27 12:54:56 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-08-27 12:54:56 -0400 |
commit | cc891865fa1eb5a823f6a3eeb1746f05addb0d90 (patch) | |
tree | 968957fa0473278e6fd80c70eb26489c5115c834 /files | |
parent | 71a3c2e14a52026811fd50396275b0efe0ce9101 (diff) | |
parent | c53141353dc5627cd6b782ff93b215e8fa8d391c (diff) |
Merge remote-tracking branch 'origin/master' into pikalax_work
Diffstat (limited to 'files')
-rw-r--r-- | files/itemtool/itemdata/item_icon/.gitignore | 4 | ||||
-rw-r--r-- | files/itemtool/itemdata/item_icon/narc_0176.NCGR | bin | 560 -> 0 bytes | |||
-rw-r--r-- | files/itemtool/itemdata/item_icon/narc_0176.png | bin | 0 -> 277 bytes | |||
-rw-r--r-- | files/itemtool/itemdata/item_icon/narc_0177.NCLR | bin | 552 -> 0 bytes | |||
-rw-r--r-- | files/itemtool/itemdata/item_icon/narc_0178.NCGR | bin | 560 -> 0 bytes | |||
-rw-r--r-- | files/itemtool/itemdata/item_icon/narc_0178.png | bin | 0 -> 292 bytes | |||
-rw-r--r-- | files/itemtool/itemdata/item_icon/narc_0179.NCLR | bin | 552 -> 0 bytes |
7 files changed, 4 insertions, 0 deletions
diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore index 6710dbd1..44e4e13d 100644 --- a/files/itemtool/itemdata/item_icon/.gitignore +++ b/files/itemtool/itemdata/item_icon/.gitignore @@ -172,3 +172,7 @@ narc_0172.NCGR narc_0172.NCLR narc_0174.NCGR narc_0174.NCLR +narc_0176.NCGR +narc_0176.NCLR +narc_0178.NCGR +narc_0178.NCLR diff --git a/files/itemtool/itemdata/item_icon/narc_0176.NCGR b/files/itemtool/itemdata/item_icon/narc_0176.NCGR Binary files differdeleted file mode 100644 index a3e9ccc7..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0176.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0176.png b/files/itemtool/itemdata/item_icon/narc_0176.png Binary files differnew file mode 100644 index 00000000..639d3cce --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0176.png diff --git a/files/itemtool/itemdata/item_icon/narc_0177.NCLR b/files/itemtool/itemdata/item_icon/narc_0177.NCLR Binary files differdeleted file mode 100644 index c732a021..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0177.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0178.NCGR b/files/itemtool/itemdata/item_icon/narc_0178.NCGR Binary files differdeleted file mode 100644 index 8e933bc2..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0178.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0178.png b/files/itemtool/itemdata/item_icon/narc_0178.png Binary files differnew file mode 100644 index 00000000..35073906 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0178.png diff --git a/files/itemtool/itemdata/item_icon/narc_0179.NCLR b/files/itemtool/itemdata/item_icon/narc_0179.NCLR Binary files differdeleted file mode 100644 index acb93512..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0179.NCLR +++ /dev/null |