Logo improvements

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65ad4710225d6548071790921bcc7ced88669ee3..997e8518f35a7e7364607ada939b0f6c7f5ccb0d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,14 +186,14 @@ if(UNIX AND NOT APPLE)
        install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
        install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
        install(FILES "misc/net.minetest.minetest.appdata.xml" DESTINATION "${APPDATADIR}")
-       install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
-       install(FILES "misc/minetest-xorg-icon-128.png"
+       install(FILES "misc/dragonfire.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
+       install(FILES "misc/dragonfire-xorg-icon-128.png"
                DESTINATION "${ICONDIR}/hicolor/128x128/apps"
-               RENAME "minetest.png")
+               RENAME "dragonfire.png")
 endif()
 
 if(APPLE)
-       install(FILES "misc/minetest-icon.icns" DESTINATION "${SHAREDIR}")
+       install(FILES "misc/dragonfire-icon.icns" DESTINATION "${SHAREDIR}")
        install(FILES "misc/Info.plist" DESTINATION "${BUNDLE_PATH}/Contents")
 endif()
 
@@ -279,7 +279,7 @@ if(WIN32)
                set(CPACK_CREATE_DESKTOP_LINKS ${PROJECT_NAME})
                set(CPACK_PACKAGING_INSTALL_PREFIX "/${PROJECT_NAME_CAPITALIZED}")
 
-               set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.ico")
+               set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/dragonfire-icon.ico")
                # Supported languages can be found at
                # http://wixtoolset.org/documentation/manual/v3/wixui/wixui_localization.html
                #set(CPACK_WIX_CULTURES "ar-SA,bg-BG,ca-ES,hr-HR,cs-CZ,da-DK,nl-NL,en-US,et-EE,fi-FI,fr-FR,de-DE")

diff --git a/LICENSE.txt b/LICENSE.txt
index 9b8ee851aba3f91d7802265621cee64d83fe483a..27b30323aad7b49abff59a9c73f8db71d71e0959 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -33,10 +33,10 @@ rubenwardy, paramat:
   textures/base/pack/start_icon.png
   textures/base/pack/end_icon.png
 
-erlehmann:
-  misc/minetest-icon-24x24.png
-  misc/minetest-icon.ico
-  misc/minetest.svg
+EliasFleckenstein03:
+  misc/dragonfire-icon-24x24.png
+  misc/dragonfire-icon.ico
+  misc/dragonfire.svg
   textures/base/pack/logo.png
 
 JRottm

diff --git a/builtin/client/cheats.lua b/builtin/client/cheats.lua
index d158b9fbc540e1330e35de8e6f559ae4e4077a10..e4cace74409263f1887dafa0d3c02c4824051f25 100644 (file)
--- a/builtin/client/cheats.lua
+++ b/builtin/client/cheats.lua
@@ -1,7 +1,7 @@
 core.cheats = {
        ["Combat"] = {
                ["AntiKnockback"] = "antiknockback",
-               ["AttachmentFloat"] = "float_above_parent",             
+               ["AttachmentFloat"] = "float_above_parent",
        },
        ["Movement"] = {
                ["Freecam"] = "freecam",

diff --git a/misc/Info.plist b/misc/Info.plist
index 1498ee474c0897d266f91065990b25d35a6fdb3d..b80ae9d7cad951613e7957779892c8fdf28c2cc4 100644 (file)
--- a/misc/Info.plist
+++ b/misc/Info.plist
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>minetest</string>
        <key>CFBundleIconFile</key>
-       <string>minetest-icon.icns</string>
+       <string>dragonfire-icon.icns</string>
        <key>CFBundleIdentifier</key>
        <string>net.minetest.minetest</string>
 </dict>

diff --git a/misc/dragonfire-icon-24x24.png b/misc/dragonfire-icon-24x24.png
new file mode 100644 (file)
index 0000000..0edc90e
Binary files /dev/null and b/misc/dragonfire-icon-24x24.png differ

diff --git a/misc/dragonfire-icon.icns b/misc/dragonfire-icon.icns
new file mode 100644 (file)
index 0000000..bb20daf
Binary files /dev/null and b/misc/dragonfire-icon.icns differ

diff --git a/misc/dragonfire-icon.ico b/misc/dragonfire-icon.ico
new file mode 100644 (file)
index 0000000..3ac1f5c
Binary files /dev/null and b/misc/dragonfire-icon.ico differ

diff --git a/misc/dragonfire-icon.ico.png b/misc/dragonfire-icon.ico.png
new file mode 100644 (file)
index 0000000..6c04cf7
Binary files /dev/null and b/misc/dragonfire-icon.ico.png differ

diff --git a/misc/dragonfire-xorg-icon-128.png b/misc/dragonfire-xorg-icon-128.png
new file mode 100644 (file)
index 0000000..b1ed452
Binary files /dev/null and b/misc/dragonfire-xorg-icon-128.png differ

diff --git a/misc/dragonfire.svg b/misc/dragonfire.svg
new file mode 100644 (file)
index 0000000..3504926
--- /dev/null
+++ b/misc/dragonfire.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="424.759mm"
+   height="548.14117mm"
+   viewBox="0 0 424.759 548.14117"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="dragonfire.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="821.97201"
+     inkscape:cy="1504.5142"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer2"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:object-paths="false"
+     inkscape:snap-global="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="0"
+     inkscape:window-y="42"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(121.51509,140.87775)">
+    <path
+       style="fill:#d97c00;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 174.63127,40.893641 c -0.62502,9.168773 -1.62909,25.023007 -18.75726,35.157567 -7.90853,4.679393 -14.88691,6.794713 -21.4562,10.084768 -10.0234,5.019952 -19.11206,10.735064 -29.23784,16.443334 L 92.551574,80.797555 162.67724,33.953338 Z"
+       id="path884"
+       sodipodi:nodetypes="csscccc" />
+    <path
+       style="fill:#d97b00;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 185.29405,-52.901706 c 11.8624,-1.285468 24.94967,-4.400419 37.49354,-1.637969 12.24665,2.696994 31.53215,34.732889 51.00592,52.1769726 0,0 -16.21214,16.4095564 -26.41499,18.4986104 -13.0146,2.664766 -38.0854,-8.8161096 -38.0854,-8.8161096 z"
+       id="path892"
+       sodipodi:nodetypes="cscscc" />
+    <path
+       id="path894"
+       style="fill:#d97b00;fill-opacity:1;stroke:#000000;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -237.29492,-365.62695 -102.4961,44.47656 c -39.64671,13.3036 -77.7993,9.74465 -114.99609,-4.59961 18.83278,64.6973 61.65447,80.70688 100.22461,105.34766 l 20.38281,12.67773 119.65821,-37.31055 z m 142.837889,330.521481 -181.515629,1.728516 c -12.82292,20.53197 -27.12291,45.236147 -34.40429,60.970703 25.65593,22.007697 51.66201,10.680981 82.19922,16.123047 z M -53.662109,97.027344 C -135.91186,164.51608 -191.67233,232.94647 -185.17578,306.11133 c 49.25913,-27.21072 79.87529,-71.5969 201.523436,-46.86719 L 261.88672,158.70312 Z"
+       transform="scale(0.26458333)" />
+    <path
+       id="path849"
+       style="fill:#f38a00;fill-opacity:1;stroke:#000000;stroke-width:0.99999899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 568.43555,-526.07617 c -14.82346,21.59652 -10.36236,62.4642 -47.95452,70.79164 -3.38976,0.7509 -17.46828,-1.19108 -32.98408,0.43695 -18.84158,1.977 -40.48071,8.03189 -56.324,15.42617 -33.24391,15.51539 -77.8147,55.62913 -112.75465,72.95834 -32.78338,16.2596 -36.77134,9.79692 -48.67664,17.98947 -8.00352,5.50757 -21.67624,19.44462 -21.53854,37.67868 1.19409,158.11527 151.15589,21.69112 199.53516,71.1914 14.8786,15.22338 11.88459,36.39462 6.97461,54.90625 C 404.66662,3.9869356 162.60235,42.347074 56.927734,203.88477 3.9446038,284.87653 -80.069959,397.39278 -61.841797,492.44336 -35.456633,630.02852 99.783247,729.97044 214.32617,846.58984 c 64.00921,65.16957 141.98892,113.48363 192.04102,170.23046 63.76539,72.2944 92.82338,147.3005 105.11523,169.2305 56.96806,101.6371 -68.9819,229.5341 -152.16211,352.0234 89.58072,-40.6129 334.76613,-100.9267 345.77344,-313.8867 8.59476,-166.285 -117.78329,-338.01531 -312.1543,-489.22461 -77.20543,-60.0613 -109.34724,-150.31587 -82.55664,-230.82812 39.58416,-2.09715 78.27934,-10.6901 117.06836,-10.44141 69.69555,0.44689 149.1488,19.05746 219.20117,-15.58398 42.10833,-20.8229 71.05515,-89.9449 6.08008,-97.95508 C 576.02986,370.69838 530.2339,386.8415 437.13477,331.12891 481.58375,261.29772 638.13906,201.85117 826.60547,111.95703 872.12663,90.244477 883.77888,74.964433 937.43555,37.869141 991.28524,0.64040756 1075.7032,-65.93749 1138.916,-103.27734 c 9.0613,-29.61017 11.7554,-61.56671 -10.1523,-90.7793 -13.2778,-17.97641 -31.3708,-35.51132 -72.1446,-27.36328 -65.3167,125.783129 -225.8886,147.014404 -255.41012,115.72851 -32.2648,-34.19314 -63.32519,-85.26367 -98.67382,-146.27148 -28.74123,-49.60415 -74.03362,-99.10568 -102.28907,-160.50781 -16.09375,-34.97356 -24.38944,-78.9681 -31.81054,-113.60547 z m -72.97657,109.20898 c -14.47479,6.90263 -24.42683,17.72656 -35.82226,19.68946 -10.11164,1.74179 -10.15066,-1.10847 -12.14844,-4.88868 14.42018,-10.39842 30.98895,-13.31935 47.9707,-14.80078 z"
+       sodipodi:nodetypes="cssssssscssssscsscssscsscccsssccscc"
+       transform="scale(0.26458333)"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 75.771318,-72.60352 22.637085,-3.724836"
+       id="path902"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 78.31929,82.489785 c 12.057476,-2.128665 24.22843,-3.138178 37.33924,5.121331"
+       id="path886"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 172.90786,108.41166 c 3.79692,-2.83643 8.26351,1.6997 9.45928,4.49824"
+       id="path888"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 167.99805,114.53389 c 3.77662,-2.00305 9.73661,-1.26459 9.29324,7.24955"
+       id="path890"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 74.691115,-89.86943 3.585337,-2.090091"
+       id="path904" />
+    <path
+       style="display:inline;fill:#ff9100;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -121.28811,-140.46489 c 30.230229,30.11602 37.182859,15.03379 76.840571,15.23187 12.764686,0.0638 33.640637,1.60284 54.652193,8.63798 18.309364,6.13039 36.913564,17.321485 47.885882,23.979967 42.623434,25.865762 74.689314,48.986152 74.294234,62.692517 C 131.61006,-3.0450289 46.340705,36.780877 32.944678,39.054476 -18.358314,47.761715 -52.033419,15.59799 -85.52309,71.851913 -93.677049,61.283562 -86.706295,31.892897 -59.723271,-1.1510784 -81.022343,-4.4118581 -102.93941,-9.3410193 -116.90663,-23.833561 c 3.12282,-13.93191 21.426823,-42.460615 50.349014,-47.510697 -12.667717,-12.219711 -43.351564,-17.767543 -54.730494,-69.120632 z"
+       id="path847"
+       sodipodi:nodetypes="csssssccccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 173.65593,104.49243 c 3.47593,-2.78405 6.55751,-0.24685 8.31582,1.60947"
+       id="path908"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>

diff --git a/misc/minetest-icon-24x24.png b/misc/minetest-icon-24x24.png
deleted file mode 100644 (file)
index 39c5b8e..0000000
Binary files a/misc/minetest-icon-24x24.png and /dev/null differ

diff --git a/misc/minetest-icon.icns b/misc/minetest-icon.icns
deleted file mode 100644 (file)
index bb20daf..0000000
Binary files a/misc/minetest-icon.icns and /dev/null differ

diff --git a/misc/minetest-icon.ico b/misc/minetest-icon.ico
deleted file mode 100644 (file)
index 53308b3..0000000
Binary files a/misc/minetest-icon.ico and /dev/null differ

diff --git a/misc/minetest-xorg-icon-128.png b/misc/minetest-xorg-icon-128.png
deleted file mode 100644 (file)
index 9cf15a0..0000000
Binary files a/misc/minetest-xorg-icon-128.png and /dev/null differ

diff --git a/misc/minetest.svg b/misc/minetest.svg
deleted file mode 100644 (file)
index a95f5d9..0000000
--- a/misc/minetest.svg
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="424.759mm"
-   height="548.14117mm"
-   viewBox="0 0 424.759 548.14117"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="fleckvec.svg"
-   inkscape:version="1.0.1 (1.0.1+r74)">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.49497475"
-     inkscape:cx="241.93184"
-     inkscape:cy="805.35667"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer2"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     inkscape:object-paths="false"
-     inkscape:snap-global="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1056"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2"
-     transform="translate(121.51509,140.87775)">
-    <path
-       style="fill:#d97c00;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 174.63127,40.893641 c -0.62502,9.168773 -1.62909,25.023007 -18.75726,35.157567 -7.90853,4.679393 -14.88691,6.794713 -21.4562,10.084768 -10.0234,5.019952 -19.11206,10.735064 -29.23784,16.443334 L 92.551574,80.797555 162.67724,33.953338 Z"
-       id="path884"
-       sodipodi:nodetypes="csscccc" />
-    <path
-       style="fill:#d97b00;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 185.29405,-52.901706 c 11.8624,-1.285468 24.94967,-4.400419 37.49354,-1.637969 12.24665,2.696994 31.53215,34.732889 51.00592,52.1769726 0,0 -16.21214,16.4095564 -26.41499,18.4986104 -13.0146,2.664766 -38.0854,-8.8161096 -38.0854,-8.8161096 z"
-       id="path892"
-       sodipodi:nodetypes="cscscc" />
-    <path
-       id="path894"
-       style="fill:#d97b00;fill-opacity:1;stroke:#000000;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m -237.29492,-365.62695 -102.4961,44.47656 c -39.64671,13.3036 -77.7993,9.74465 -114.99609,-4.59961 18.83278,64.6973 61.65447,80.70688 100.22461,105.34766 l 20.38281,12.67773 119.65821,-37.31055 z m 142.837889,330.521481 -181.515629,1.728516 c -12.82292,20.53197 -27.12291,45.236147 -34.40429,60.970703 25.65593,22.007697 51.66201,10.680981 82.19922,16.123047 z M -53.662109,97.027344 C -135.91186,164.51608 -191.67233,232.94647 -185.17578,306.11133 c 49.25913,-27.21072 79.87529,-71.5969 201.523436,-46.86719 L 261.88672,158.70312 Z"
-       transform="scale(0.26458333)" />
-    <path
-       id="path849"
-       style="fill:#f38a00;fill-opacity:1;stroke:#000000;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 568.43555,-526.07617 c -14.82346,21.59652 -27.86236,56.39279 -65.45452,64.72021 -16.14345,3.5761 -103.3607,45.72883 -168.66462,78.11768 -54.82253,27.19035 -86.45583,27.08601 -86.11329,72.44336 1.19414,158.11527 151.15589,21.69112 199.53516,71.1914 14.8786,15.22338 11.88459,36.39462 6.97461,54.90625 C 404.66662,3.9869356 162.60235,42.347074 56.927734,203.88477 3.9446038,284.87653 -80.069959,397.39278 -61.841797,492.44336 -35.456633,630.02852 99.783247,729.97044 214.32617,846.58984 c 64.00921,65.16957 141.98892,113.48363 192.04102,170.23046 63.76539,72.2944 92.82338,147.3005 105.11523,169.2305 56.96806,101.6371 -68.9819,229.5341 -152.16211,352.0234 89.58072,-40.6129 334.76613,-100.9267 345.77344,-313.8867 8.59476,-166.285 -117.78329,-338.01531 -312.1543,-489.22461 -77.20543,-60.0613 -109.34724,-150.31587 -82.55664,-230.82812 39.58416,-2.09715 78.27934,-10.6901 117.06836,-10.44141 69.69555,0.44689 149.1488,19.05746 219.20117,-15.58398 42.10833,-20.8229 71.05515,-89.9449 6.08008,-97.95508 C 576.02986,370.69838 530.2339,386.8415 437.13477,331.12891 481.58375,261.29772 638.13906,201.85117 826.60547,111.95703 872.12663,90.244477 883.77888,74.964433 937.43555,37.869141 991.28524,0.64040756 1075.7032,-65.93749 1138.916,-103.27734 c 9.0613,-29.61017 11.7554,-61.56671 -10.1523,-90.7793 -13.2778,-17.97641 -31.3708,-35.51132 -72.1446,-27.36328 -65.3167,125.783129 -225.8886,147.014404 -255.41012,115.72851 -32.2648,-34.19314 -63.32519,-85.26367 -98.67382,-146.27148 -28.74123,-49.60415 -74.03362,-99.10568 -102.28907,-160.50781 -16.09375,-34.97356 -24.38944,-78.9681 -31.81054,-113.60547 z m -72.97657,109.20898 c -14.47479,6.90263 -24.42683,17.72656 -35.82226,19.68946 -10.11164,1.74179 -10.15066,-1.10847 -12.14844,-4.88868 14.42018,-10.39842 30.98895,-13.31935 47.9707,-14.80078 z"
-       transform="scale(0.26458333)"
-       sodipodi:nodetypes="csssscssssscsscssscsscccsssccscc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 75.771318,-72.60352 22.637085,-3.724836"
-       id="path902"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 78.31929,82.489785 c 12.057476,-2.128665 24.22843,-3.138178 37.33924,5.121331"
-       id="path886"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 172.90786,108.41166 c 3.79692,-2.83643 8.26351,1.6997 9.45928,4.49824"
-       id="path888"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 167.99805,114.53389 c 3.77662,-2.00305 9.73661,-1.26459 9.29324,7.24955"
-       id="path890"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 74.691115,-89.86943 3.585337,-2.090091"
-       id="path904" />
-    <path
-       style="display:inline;fill:#ff9100;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m -121.28811,-140.46489 c 30.230229,30.11602 37.182859,15.03379 76.840571,15.23187 12.764686,0.0638 33.640637,1.60284 54.652193,8.63798 18.309364,6.13039 36.913564,17.321485 47.885882,23.979967 42.623434,25.865762 74.689314,48.986152 74.294234,62.692517 C 131.61006,-3.0450289 46.340705,36.780877 32.944678,39.054476 -18.358314,47.761715 -52.033419,15.59799 -85.52309,71.851913 -93.677049,61.283562 -86.706295,31.892897 -59.723271,-1.1510784 -81.022343,-4.4118581 -102.93941,-9.3410193 -116.90663,-23.833561 c 3.12282,-13.93191 21.426823,-42.460615 50.349014,-47.510697 -12.667717,-12.219711 -43.351564,-17.767543 -54.730494,-69.120632 z"
-       id="path847"
-       sodipodi:nodetypes="csssssccccc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 173.65593,104.49243 c 3.47593,-2.78405 6.55751,-0.24685 8.31582,1.60947"
-       id="path908"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>

diff --git a/misc/net.minetest.minetest.desktop b/misc/net.minetest.minetest.desktop
old mode 100644 (file)
new mode 100755 (executable)
index ca493c4..737dfb2
--- a/misc/net.minetest.minetest.desktop
+++ b/misc/net.minetest.minetest.desktop
@@ -1,3 +1,4 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=Minetest
 GenericName=Minetest
@@ -9,7 +10,7 @@ Comment[ja]=マルチプレイに対応した、無限の世界のブロック
 Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков
 Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et
 Exec=minetest
-Icon=minetest
+Icon=dragonfire
 Terminal=false
 Type=Application
 Categories=Game;Simulation;

diff --git a/misc/winresource.rc b/misc/winresource.rc
index e1e82581b1cbe1e05b377758ce64e3700991e9be..bd93be91dfc0e73bd0c53afcb982bfd711e06548 100644 (file)
--- a/misc/winresource.rc
+++ b/misc/winresource.rc
@@ -14,7 +14,7 @@
 #endif\r
 \r
 LANGUAGE 0, SUBLANG_NEUTRAL\r
-130        ICON         "minetest-icon.ico"\r
+130        ICON         "dragonfire-icon.ico"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r

diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp
index f5aca8f58f82a82b514f80995b879d3a83fc4555..22c8a8102fb2193b1a726598092b814553add091 100644 (file)
--- a/src/client/renderingengine.cpp
+++ b/src/client/renderingengine.cpp
@@ -347,15 +347,14 @@ bool RenderingEngine::setWindowIcon()
 #if defined(XORG_USED)
 #if RUN_IN_PLACE
        return setXorgWindowIconFromPath(
-                       porting::path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
+                       porting::path_share + "/misc/dragonfire-xorg-icon-128.png");
 #else
        // We have semi-support for reading in-place data if we are
        // compiled with RUN_IN_PLACE. Don't break with this and
        // also try the path_share location.
        return setXorgWindowIconFromPath(
-                              ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") ||
-              setXorgWindowIconFromPath(porting::path_share + "/misc/" PROJECT_NAME
-                                                              "-xorg-icon-128.png");
+                              ICON_DIR "/hicolor/128x128/apps/dragonfire.png") ||
+              setXorgWindowIconFromPath(porting::path_share + "/misc/dragonfire-xorg-icon-128.png");
 #endif
 #elif defined(_WIN32)
        HWND hWnd; // Window handle

diff --git a/textures/base/pack/logo.png b/textures/base/pack/logo.png
index 48793678f178139f0713f0a4aada1e9736b78654..5284900b204213e6e8a9145cc0abeeeee1ca9ac3 100644 (file)
Binary files a/textures/base/pack/logo.png and b/textures/base/pack/logo.png differ