Merge branch 'upstream/develop' into develop

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

1 files changed, 74 insertions, 40 deletions

diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
index 3f3d22fc..42b496da 100644
--- a/launcher/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
@@ -6,9 +6,6 @@
         <!-- REDDIT logo icon, needs reddit license! -->
         <file>scalable/reddit-alien.svg</file>
 
-        <!-- Icon for CurseForge. CC0 -->
-        <file alias="128x128/flame.png">128x128/instances/flame.png</file>
-
         <!-- launcher settings page -->
         <file>scalable/launcher.svg</file>
 
@@ -254,63 +251,100 @@
         <!-- discord logo icon thing. from discord. traced from bitmap -->
         <file>scalable/discord.svg</file>
 
+        <!-- flat instance icons CC BY-SA 4.0, Santiago Cézar -->
+        <file alias="128x128/flame.png">scalable/instances/flame.svg</file>
+        <file>scalable/instances/chicken.svg</file>
+        <file>scalable/instances/creeper.svg</file>
+        <file>scalable/instances/enderpearl.svg</file>
+        <file>scalable/instances/ftb_logo.svg</file>
+        <file>scalable/instances/flame.svg</file>
+        <file>scalable/instances/gear.svg</file>
+        <file>scalable/instances/herobrine.svg</file>
+        <file>scalable/instances/magitech.svg</file>
+        <file>scalable/instances/meat.svg</file>
+        <file>scalable/instances/netherstar.svg</file>
+        <file>scalable/instances/skeleton.svg</file>
+        <file>scalable/instances/squarecreeper.svg</file>
+        <file>scalable/instances/steve.svg</file>
+        <file>scalable/instances/diamond.svg</file>
+        <file>scalable/instances/dirt.svg</file>
+        <file>scalable/instances/grass.svg</file>
+        <file>scalable/instances/brick.svg</file>
+        <file>scalable/instances/gold.svg</file>
+        <file>scalable/instances/iron.svg</file>
+        <file>scalable/instances/planks.svg</file>
+        <file>scalable/instances/stone.svg</file>
+        <file>scalable/instances/tnt.svg</file>
+        <file>scalable/instances/enderman.svg</file>
+        <file>scalable/instances/fox.svg</file>
+        <file>scalable/instances/bee.svg</file>
 
+		
         <!-- instance icons -->
-        <file>32x32/instances/chicken.png</file>
-        <file>128x128/instances/chicken.png</file>
+        <file>32x32/instances/chicken_legacy.png</file>
+        <file>128x128/instances/chicken_legacy.png</file>
 
-        <file>32x32/instances/creeper.png</file>
-        <file>128x128/instances/creeper.png</file>
+        <file>32x32/instances/creeper_legacy.png</file>
+        <file>128x128/instances/creeper_legacy.png</file>
 
-        <file>32x32/instances/enderpearl.png</file>
-        <file>128x128/instances/enderpearl.png</file>
+        <file>32x32/instances/enderpearl_legacy.png</file>
+        <file>128x128/instances/enderpearl_legacy.png</file>
 
         <file>32x32/instances/ftb_glow.png</file>
         <file>128x128/instances/ftb_glow.png</file>
 
-        <file>32x32/instances/ftb_logo.png</file>
-        <file>128x128/instances/ftb_logo.png</file>
+        <file>32x32/instances/ftb_logo_legacy.png</file>
+        <file>128x128/instances/ftb_logo_legacy.png</file>
 
-        <file>128x128/instances/flame.png</file>
+        <file>128x128/instances/flame_legacy.png</file>
 
-        <file>32x32/instances/gear.png</file>
-        <file>128x128/instances/gear.png</file>
+        <file>32x32/instances/gear_legacy.png</file>
+        <file>128x128/instances/gear_legacy.png</file>
 
-        <file>32x32/instances/herobrine.png</file>
-        <file>128x128/instances/herobrine.png</file>
+        <file>32x32/instances/herobrine_legacy.png</file>
+        <file>128x128/instances/herobrine_legacy.png</file>
 
-        <file>32x32/instances/magitech.png</file>
-        <file>128x128/instances/magitech.png</file>
+        <file>32x32/instances/magitech_legacy.png</file>
+        <file>128x128/instances/magitech_legacy.png</file>
 
-        <file>32x32/instances/meat.png</file>
-        <file>128x128/instances/meat.png</file>
+        <file>32x32/instances/meat_legacy.png</file>
+        <file>128x128/instances/meat_legacy.png</file>
 
-        <file>32x32/instances/netherstar.png</file>
-        <file>128x128/instances/netherstar.png</file>
+        <file>32x32/instances/netherstar_legacy.png</file>
+        <file>128x128/instances/netherstar_legacy.png</file>
 
-        <file>32x32/instances/skeleton.png</file>
-        <file>128x128/instances/skeleton.png</file>
+        <file>32x32/instances/skeleton_legacy.png</file>
+        <file>128x128/instances/skeleton_legacy.png</file>
 
-        <file>32x32/instances/squarecreeper.png</file>
-        <file>128x128/instances/squarecreeper.png</file>
+        <file>32x32/instances/squarecreeper_legacy.png</file>
+        <file>128x128/instances/squarecreeper_legacy.png</file>
 
-        <file>32x32/instances/steve.png</file>
-        <file>128x128/instances/steve.png</file>
+        <file>32x32/instances/steve_legacy.png</file>
+        <file>128x128/instances/steve_legacy.png</file>
 
-        <file>32x32/instances/brick.png</file>
-        <file>32x32/instances/diamond.png</file>
-        <file>32x32/instances/dirt.png</file>
-        <file>32x32/instances/gold.png</file>
-        <file>32x32/instances/grass.png</file>
-        <file>32x32/instances/iron.png</file>
-        <file>32x32/instances/planks.png</file>
-        <file>32x32/instances/stone.png</file>
-        <file>32x32/instances/tnt.png</file>
+        <file>32x32/instances/brick_legacy.png</file>
+        <file>32x32/instances/diamond_legacy.png</file>
+        <file>32x32/instances/dirt_legacy.png</file>
+        <file>32x32/instances/gold_legacy.png</file>
+        <file>32x32/instances/grass_legacy.png</file>
+        <file>32x32/instances/iron_legacy.png</file>
+        <file>32x32/instances/planks_legacy.png</file>
+        <file>32x32/instances/stone_legacy.png</file>
+        <file>32x32/instances/tnt_legacy.png</file>
 
-        <file>50x50/instances/enderman.png</file>
+        <file>50x50/instances/enderman_legacy.png</file>
 
-        <file>scalable/instances/fox.svg</file>
-        <file>scalable/instances/bee.svg</file>
         <file>scalable/instances/prismlauncher.svg</file>
+        <file>scalable/instances/fox_legacy.svg</file>
+        <file>scalable/instances/bee_legacy.svg</file>
+
+        <!-- delete, tag, rename, shortcut CC-BY-SA 3.0, Oxygen icons.-->
+        <file>scalable/delete.svg</file>
+        <file>scalable/tag.svg</file>
+        <file>scalable/rename.svg</file>
+        <file>scalable/shortcut.svg</file>
+
+        <file>scalable/export.svg</file>
+        <file>scalable/launch.svg</file>
     </qresource>
 </RCC>