Merge branch 'upstream/develop' into develop

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

14 files changed, 0 insertions, 0 deletions

diff --git a/launcher/resources/multimc/128x128/instances/chicken.png b/launcher/resources/multimc/128x128/instances/chicken_legacy.png
index 71f6dedc..71f6dedc 100644
--- a/launcher/resources/multimc/128x128/instances/chicken.png
+++ b/launcher/resources/multimc/128x128/instances/chicken_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/creeper.png b/launcher/resources/multimc/128x128/instances/creeper_legacy.png
index 41b7d07d..41b7d07d 100644
--- a/launcher/resources/multimc/128x128/instances/creeper.png
+++ b/launcher/resources/multimc/128x128/instances/creeper_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/enderpearl.png b/launcher/resources/multimc/128x128/instances/enderpearl_legacy.png
index 0a5bf91a..0a5bf91a 100644
--- a/launcher/resources/multimc/128x128/instances/enderpearl.png
+++ b/launcher/resources/multimc/128x128/instances/enderpearl_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/flame.png b/launcher/resources/multimc/128x128/instances/flame_legacy.png
index 6482975c..6482975c 100644
--- a/launcher/resources/multimc/128x128/instances/flame.png
+++ b/launcher/resources/multimc/128x128/instances/flame_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/ftb_logo.png b/launcher/resources/multimc/128x128/instances/ftb_logo_legacy.png
index e725b7fe..e725b7fe 100644
--- a/launcher/resources/multimc/128x128/instances/ftb_logo.png
+++ b/launcher/resources/multimc/128x128/instances/ftb_logo_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/gear.png b/launcher/resources/multimc/128x128/instances/gear_legacy.png
index 75c68a66..75c68a66 100644
--- a/launcher/resources/multimc/128x128/instances/gear.png
+++ b/launcher/resources/multimc/128x128/instances/gear_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/herobrine.png b/launcher/resources/multimc/128x128/instances/herobrine_legacy.png
index 13f1494c..13f1494c 100644
--- a/launcher/resources/multimc/128x128/instances/herobrine.png
+++ b/launcher/resources/multimc/128x128/instances/herobrine_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/infinity.png b/launcher/resources/multimc/128x128/instances/infinity_legacy.png
index 63e06e5b..63e06e5b 100644
--- a/launcher/resources/multimc/128x128/instances/infinity.png
+++ b/launcher/resources/multimc/128x128/instances/infinity_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/magitech.png b/launcher/resources/multimc/128x128/instances/magitech_legacy.png
index 0f81a199..0f81a199 100644
--- a/launcher/resources/multimc/128x128/instances/magitech.png
+++ b/launcher/resources/multimc/128x128/instances/magitech_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/meat.png b/launcher/resources/multimc/128x128/instances/meat_legacy.png
index fefc9bf1..fefc9bf1 100644
--- a/launcher/resources/multimc/128x128/instances/meat.png
+++ b/launcher/resources/multimc/128x128/instances/meat_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/netherstar.png b/launcher/resources/multimc/128x128/instances/netherstar_legacy.png
index 132085f0..132085f0 100644
--- a/launcher/resources/multimc/128x128/instances/netherstar.png
+++ b/launcher/resources/multimc/128x128/instances/netherstar_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/skeleton.png b/launcher/resources/multimc/128x128/instances/skeleton_legacy.png
index 55fcf5a9..55fcf5a9 100644
--- a/launcher/resources/multimc/128x128/instances/skeleton.png
+++ b/launcher/resources/multimc/128x128/instances/skeleton_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/squarecreeper.png b/launcher/resources/multimc/128x128/instances/squarecreeper_legacy.png
index c82d8406..c82d8406 100644
--- a/launcher/resources/multimc/128x128/instances/squarecreeper.png
+++ b/launcher/resources/multimc/128x128/instances/squarecreeper_legacy.png
diff --git a/launcher/resources/multimc/128x128/instances/steve.png b/launcher/resources/multimc/128x128/instances/steve_legacy.png
index a07cbd2f..a07cbd2f 100644
--- a/launcher/resources/multimc/128x128/instances/steve.png
+++ b/launcher/resources/multimc/128x128/instances/steve_legacy.png