diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-03-19 22:25:36 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-03-19 22:25:36 +0100 |
| commit | 26b485d82f03c0191142cf9b660b4ab43962878d (patch) | |
| tree | 092364c614f29865fec4bdb6bd158de1c2d4db9a /resources | |
| parent | 919dea0de60d058f57a4b9bd1e5f4513a014c693 (diff) | |
| parent | ad9b16bd3d6a71b4cdf1763d166bc9cc633e147c (diff) | |
| download | MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.tar MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.tar.gz MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.tar.lz MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.tar.xz MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.zip | |
Merge remote-tracking branch 'origin/feature_badges' into develop
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/instances/broken.png | bin | 0 -> 1139 bytes | |||
| -rw-r--r-- | resources/instances/instances.qrc | 11 | ||||
| -rw-r--r-- | resources/instances/kitten.png | bin | 0 -> 1605 bytes |
3 files changed, 11 insertions, 0 deletions
diff --git a/resources/instances/broken.png b/resources/instances/broken.png Binary files differnew file mode 100644 index 00000000..7a80a76e --- /dev/null +++ b/resources/instances/broken.png diff --git a/resources/instances/instances.qrc b/resources/instances/instances.qrc index ec3cdf21..5124b846 100644 --- a/resources/instances/instances.qrc +++ b/resources/instances/instances.qrc @@ -32,4 +32,15 @@ <file alias="squarecreeper">squarecreeper128.png</file> <file alias="steve">steve128.png</file> </qresource> + <qresource prefix="/icons/badges"> + <!-- Source: see above --> + <file>enderman.png</file> + <file>herobrine.png</file> + <file>derp.png</file> + + <!-- Source: http://www.iconarchive.com/show/cat-icons-by-fasticon/Cat-Brown-icon.html --> + <file>kitten.png</file> + <!-- Source: http://www.iconarchive.com/show/crystal-clear-icons-by-everaldo/Filesystem-file-broken-icon.html --> + <file>broken.png</file> + </qresource> </RCC> diff --git a/resources/instances/kitten.png b/resources/instances/kitten.png Binary files differnew file mode 100644 index 00000000..d17661ce --- /dev/null +++ b/resources/instances/kitten.png |
