Merge branch 'master' of http://github.com/peterix/MultiMC5

Conflicts:
	CMakeLists.txt
	main.cpp

2 files changed, 7 insertions, 33 deletions

diff --git a/resources/catbgrnd2.png b/resources/catbgrnd2.png
new file mode 100644
index 00000000..2b949e0b
--- /dev/null
+++ b/resources/catbgrnd2.png
diff --git a/resources/icons/instances/skeleton.svg b/resources/icons/instances/skeleton.svg
index b2da5a46..5d55f272 100644
--- a/resources/icons/instances/skeleton.svg
+++ b/resources/icons/instances/skeleton.svg
@@ -13,7 +13,7 @@
    height="32"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="skeleton.svg"
    inkscape:export-filename="/home/peterix/projects/MultiMC4/src/resources/insticons/skeleton128.png"
    inkscape:export-xdpi="360"
@@ -23,19 +23,6 @@
     <filter
        color-interpolation-filters="sRGB"
        inkscape:collect="always"
-       id="filter5719"
-       x="-0.18000001"
-       width="1.36"
-       y="-0.36000001"
-       height="1.72">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.15"
-         id="feGaussianBlur5721" />
-    </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
        id="filter5723"
        x="-0.20999999"
        width="1.42"
@@ -49,19 +36,6 @@
     <filter
        color-interpolation-filters="sRGB"
        inkscape:collect="always"
-       id="filter5711"
-       x="-0.1728"
-       width="1.3456"
-       y="-0.34560001"
-       height="1.6912">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.144"
-         id="feGaussianBlur5713" />
-    </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
        id="filter5727"
        x="-0.20999999"
        width="1.42"
@@ -103,12 +77,12 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="17.044214"
-     inkscape:cy="19.500236"
+     inkscape:cx="-18.309169"
+     inkscape:cy="22.958832"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1607"
+     inkscape:window-width="1614"
      inkscape:window-height="1030"
      inkscape:window-x="1676"
      inkscape:window-y="-3"
@@ -129,7 +103,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -612,7 +586,7 @@
        x="7.9999995"
        y="1036.3622" />
     <rect
-       style="fill:#00ffff;fill-opacity:1;stroke:none;filter:url(#filter5711)"
+       style="fill:#00ffff;fill-opacity:1;stroke:none;"
        id="rect4084-3"
        width="2"
        height="1"
@@ -626,7 +600,7 @@
        x="20"
        y="1036.3622" />
     <rect
-       style="fill:#00ffff;fill-opacity:1;stroke:none;filter:url(#filter5719)"
+       style="fill:#00ffff;fill-opacity:1;stroke:none;"
        id="rect4086-7"
        width="2"
        height="1"