merge with upstream

Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>

1 files changed, 62 insertions, 9 deletions

diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
index 391a974f..0627fc47 100644
--- a/launcher/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
@@ -254,13 +254,11 @@
         <!-- discord logo icon thing. from discord. traced from bitmap -->
         <file>scalable/discord.svg</file>
 
-
-        <!-- instance icons -->
+		<!-- flat instance icons CC BY-SA 4.0, Santiago Cézar -->
         <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>
@@ -270,23 +268,78 @@
         <file>scalable/instances/skeleton.svg</file>
         <file>scalable/instances/squarecreeper.svg</file>
         <file>scalable/instances/steve.svg</file>
-
-        <file>scalable/instances/brick.svg</file>
         <file>scalable/instances/diamond.svg</file>
         <file>scalable/instances/dirt.svg</file>
-        <file>scalable/instances/gold.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>
-        <file>scalable/instances/prismlauncher.svg</file>
 
+		
+        <!-- instance icons -->
+        <file>32x32/instances/chicken_legacy.png</file>
+        <file>128x128/instances/chicken_legacy.png</file>
+        
+        <file>32x32/instances/creeper_legacy.png</file>
+        <file>128x128/instances/creeper_legacy.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_legacy.png</file>
+        <file>128x128/instances/ftb_logo_legacy.png</file>
+
+        <file>128x128/instances/flame_legacy.png</file>
+
+        <file>32x32/instances/gear_legacy.png</file>
+        <file>128x128/instances/gear_legacy.png</file>
+
+        <file>32x32/instances/herobrine_legacy.png</file>
+        <file>128x128/instances/herobrine_legacy.png</file>
+
+        <file>32x32/instances/magitech_legacy.png</file>
+        <file>128x128/instances/magitech_legacy.png</file>
+
+        <file>32x32/instances/meat_legacy.png</file>
+        <file>128x128/instances/meat_legacy.png</file>
+
+        <file>32x32/instances/netherstar_legacy.png</file>
+        <file>128x128/instances/netherstar_legacy.png</file>
+
+        <file>32x32/instances/skeleton_legacy.png</file>
+        <file>128x128/instances/skeleton_legacy.png</file>
+
+        <file>32x32/instances/squarecreeper_legacy.png</file>
+        <file>128x128/instances/squarecreeper_legacy.png</file>
+
+        <file>32x32/instances/steve_legacy.png</file>
+        <file>128x128/instances/steve_legacy.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_legacy.png</file>
+
+        <file>scalable/instances/prismlauncher.svg</file>
+        <file>scalable/instances/fox_legacy.svg</file>
+        <file>scalable/instances/bee_legacy.svg</file>
+        
         <!-- delete, tag, rename CC-BY-SA 3.0, Oxygen icons.-->
         <file>scalable/delete.svg</file>
         <file>scalable/tag.svg</file>