diff options
author | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
---|---|---|
committer | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
commit | ebb2c54975e3f0b7b891532e8e72d2ef760f96c4 (patch) | |
tree | 973de7066457a1faddffd3834eb0c260d5191ec2 /resources/icons | |
parent | 168ed3e8e58a8e5065ffa720f8d45f4cee0f2069 (diff) | |
parent | 1f13f0c665001a1a79f00cdad1e63e6c9802e55f (diff) | |
download | MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.gz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.lz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.xz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.zip |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
Diffstat (limited to 'resources/icons')
-rw-r--r-- | resources/icons/instances/clucker.svg | 12 | ||||
-rw-r--r-- | resources/icons/instances/skeleton.svg | 40 |
2 files changed, 13 insertions, 39 deletions
diff --git a/resources/icons/instances/clucker.svg b/resources/icons/instances/clucker.svg index 3ce6ad5c..0c1727eb 100644 --- a/resources/icons/instances/clucker.svg +++ b/resources/icons/instances/clucker.svg @@ -14,7 +14,7 @@ height="32" id="svg2" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.4 r9939" sodipodi:docname="clucker.svg" inkscape:export-filename="/home/peterix/projects/MultiMC4/src/resources/insticons/chicken128.png" inkscape:export-xdpi="360" @@ -234,13 +234,13 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2" - inkscape:cx="-92.12757" - inkscape:cy="71.871222" + inkscape:zoom="11.313708" + inkscape:cx="2.6058272" + inkscape:cy="11.408405" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1607" + inkscape:window-width="1614" inkscape:window-height="1030" inkscape:window-x="1676" inkscape:window-y="-3" @@ -261,7 +261,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> 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" |