diff --git a/launcher/package/ubuntu/README.md b/launcher/package/ubuntu/README.md index 892abd12..ddc97ae6 100644 --- a/launcher/package/ubuntu/README.md +++ b/launcher/package/ubuntu/README.md @@ -6,9 +6,9 @@ It contains a `.desktop` file, an icon, and a simple script that does the heavy This is also the source for the files in the [RPM package](../rpm). If you rename, create or delete files here, you'll likely also have to update the RPM spec file there. # How to build this? -You need dpkg utils. Rename the `multimc` folder to `multimc_1.5-1` and then run: +You need dpkg utils. Rename the `multimc` folder to `multimc_1.6-1` and then run: ``` -fakeroot dpkg-deb --build multimc_1.5-1 +fakeroot dpkg-deb --build multimc_1.6-1 ``` Replace the version with whatever is appropriate. diff --git a/launcher/package/ubuntu/multimc/DEBIAN/control b/launcher/package/ubuntu/multimc/DEBIAN/control index 3e0f570c..be64f517 100644 --- a/launcher/package/ubuntu/multimc/DEBIAN/control +++ b/launcher/package/ubuntu/multimc/DEBIAN/control @@ -1,5 +1,5 @@ Package: multimc -Version: 1.5-1 +Version: 1.6-1 Architecture: all Maintainer: Petr Mrázek Section: games diff --git a/launcher/resources/OSX/OSX.qrc b/launcher/resources/OSX/OSX.qrc index 1a6ec0dc..0ae7d4d0 100644 --- a/launcher/resources/OSX/OSX.qrc +++ b/launcher/resources/OSX/OSX.qrc @@ -28,6 +28,7 @@ scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg + scalable/shaderpacks.svg scalable/screenshots.svg scalable/settings.svg scalable/status-bad.svg diff --git a/launcher/resources/OSX/scalable/shaderpacks.svg b/launcher/resources/OSX/scalable/shaderpacks.svg new file mode 100644 index 00000000..cf8251ba --- /dev/null +++ b/launcher/resources/OSX/scalable/shaderpacks.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + diff --git a/launcher/resources/flat/flat.qrc b/launcher/resources/flat/flat.qrc index 614d7f98..a3cd51f8 100644 --- a/launcher/resources/flat/flat.qrc +++ b/launcher/resources/flat/flat.qrc @@ -32,6 +32,7 @@ scalable/reddit-alien.svg scalable/refresh.svg scalable/resourcepacks.svg + scalable/shaderpacks.svg scalable/screenshot-placeholder.svg scalable/screenshots.svg scalable/settings.svg diff --git a/launcher/resources/flat/scalable/shaderpacks.svg b/launcher/resources/flat/scalable/shaderpacks.svg new file mode 100644 index 00000000..f1460bd9 --- /dev/null +++ b/launcher/resources/flat/scalable/shaderpacks.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + diff --git a/launcher/resources/iOS/iOS.qrc b/launcher/resources/iOS/iOS.qrc index 75c88bb0..4aa3e891 100644 --- a/launcher/resources/iOS/iOS.qrc +++ b/launcher/resources/iOS/iOS.qrc @@ -28,6 +28,7 @@ scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg + scalable/shaderpacks.svg scalable/screenshots.svg scalable/settings.svg scalable/status-bad.svg diff --git a/launcher/resources/iOS/scalable/shaderpacks.svg b/launcher/resources/iOS/scalable/shaderpacks.svg new file mode 100644 index 00000000..a2aa1b21 --- /dev/null +++ b/launcher/resources/iOS/scalable/shaderpacks.svg @@ -0,0 +1,38 @@ + + + + + + + + + + diff --git a/launcher/resources/multimc/128x128/shaderpacks.png b/launcher/resources/multimc/128x128/shaderpacks.png new file mode 100644 index 00000000..1de0e916 Binary files /dev/null and b/launcher/resources/multimc/128x128/shaderpacks.png differ diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc index 249e8e28..eec10ea4 100644 --- a/launcher/resources/multimc/multimc.qrc +++ b/launcher/resources/multimc/multimc.qrc @@ -197,6 +197,9 @@ 32x32/resourcepacks.png 64x64/resourcepacks.png + + 128x128/shaderpacks.png + 16x16/refresh.png 22x22/refresh.png diff --git a/launcher/resources/pe_blue/pe_blue.qrc b/launcher/resources/pe_blue/pe_blue.qrc index 2a685979..2446e4c3 100644 --- a/launcher/resources/pe_blue/pe_blue.qrc +++ b/launcher/resources/pe_blue/pe_blue.qrc @@ -28,6 +28,7 @@ scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg + scalable/shaderpacks.svg scalable/screenshots.svg scalable/settings.svg scalable/status-bad.svg diff --git a/launcher/resources/pe_blue/scalable/shaderpacks.svg b/launcher/resources/pe_blue/scalable/shaderpacks.svg new file mode 100644 index 00000000..530e1ad4 --- /dev/null +++ b/launcher/resources/pe_blue/scalable/shaderpacks.svg @@ -0,0 +1,77 @@ + +image/svg+xml diff --git a/launcher/resources/pe_dark/pe_dark.qrc b/launcher/resources/pe_dark/pe_dark.qrc index a138abc4..c631c0a5 100644 --- a/launcher/resources/pe_dark/pe_dark.qrc +++ b/launcher/resources/pe_dark/pe_dark.qrc @@ -28,6 +28,7 @@ scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg + scalable/shaderpacks.svg scalable/screenshots.svg scalable/settings.svg scalable/status-bad.svg diff --git a/launcher/resources/pe_dark/scalable/shaderpacks.svg b/launcher/resources/pe_dark/scalable/shaderpacks.svg new file mode 100644 index 00000000..9cca756b --- /dev/null +++ b/launcher/resources/pe_dark/scalable/shaderpacks.svg @@ -0,0 +1,81 @@ + +image/svg+xml diff --git a/launcher/resources/pe_light/pe_light.qrc b/launcher/resources/pe_light/pe_light.qrc index f518b650..a687ed21 100644 --- a/launcher/resources/pe_light/pe_light.qrc +++ b/launcher/resources/pe_light/pe_light.qrc @@ -28,6 +28,7 @@ scalable/quickmods.svg scalable/refresh.svg scalable/resourcepacks.svg + scalable/shaderpacks.svg scalable/screenshots.svg scalable/settings.svg scalable/status-bad.svg diff --git a/launcher/resources/pe_light/scalable/shaderpacks.svg b/launcher/resources/pe_light/scalable/shaderpacks.svg new file mode 100644 index 00000000..76356ee7 --- /dev/null +++ b/launcher/resources/pe_light/scalable/shaderpacks.svg @@ -0,0 +1,81 @@ + +image/svg+xml