diff options
| author | RabbitType99 <luis.be@gmx.de> | 2021-03-13 17:10:14 +0100 |
|---|---|---|
| committer | RabbitType99 <luis.be@gmx.de> | 2021-03-13 17:10:14 +0100 |
| commit | 440911c722b2acaa94a4d40daae3f29d81329441 (patch) | |
| tree | 75d31ad4e45f43085c826d722f0df6879e95a518 /src/main/resources/assets/dsm | |
| parent | a3f51f679364d8d97fe55f4aed3a80c61d6849b7 (diff) | |
| parent | ed93b04124db9b8944ddd1ed33d0f4dabf4a486b (diff) | |
| download | SkyblockMod-440911c722b2acaa94a4d40daae3f29d81329441.tar.gz SkyblockMod-440911c722b2acaa94a4d40daae3f29d81329441.tar.bz2 SkyblockMod-440911c722b2acaa94a4d40daae3f29d81329441.zip | |
Merge branch 'InstallerFrame' into development_test
# Conflicts:
# src/main/java/me/Danker/commands/ToggleCommand.java
Diffstat (limited to 'src/main/resources/assets/dsm')
| -rw-r--r-- | src/main/resources/assets/dsm/icons/folder.png | bin | 0 -> 454 bytes |
| -rw-r--r-- | src/main/resources/assets/dsm/icons/logo.png | bin | 0 -> 40669 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/dsm/icons/folder.png b/src/main/resources/assets/dsm/icons/folder.png Binary files differnew file mode 100644 index 0000000..f4af735 --- /dev/null +++ b/src/main/resources/assets/dsm/icons/folder.png diff --git a/src/main/resources/assets/dsm/icons/logo.png b/src/main/resources/assets/dsm/icons/logo.png Binary files differnew file mode 100644 index 0000000..be4667b --- /dev/null +++ b/src/main/resources/assets/dsm/icons/logo.png |
