Logo improvements

17 files changed, 28 insertions, 27 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65ad47102..997e8518f 100644
--- 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 9b8ee851a..27b30323a 100644
--- 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 d158b9fbc..e4cace744 100644
--- 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 1498ee474..b80ae9d7c 100644
--- 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
index 000000000..0edc90e20
--- /dev/null
+++ b/misc/dragonfire-icon-24x24.png
diff --git a/misc/minetest-icon.icns b/misc/dragonfire-icon.icns
index bb20daf38..bb20daf38 100644
--- a/misc/minetest-icon.icns
+++ b/misc/dragonfire-icon.icns
diff --git a/misc/dragonfire-icon.ico b/misc/dragonfire-icon.ico
new file mode 100644
index 000000000..3ac1f5c81
--- /dev/null
+++ b/misc/dragonfire-icon.ico
diff --git a/misc/dragonfire-icon.ico.png b/misc/dragonfire-icon.ico.png
new file mode 100644
index 000000000..6c04cf7ee
--- /dev/null
+++ b/misc/dragonfire-icon.ico.png
diff --git a/misc/dragonfire-xorg-icon-128.png b/misc/dragonfire-xorg-icon-128.png
new file mode 100644
index 000000000..b1ed4522f
--- /dev/null
+++ b/misc/dragonfire-xorg-icon-128.png
diff --git a/misc/minetest.svg b/misc/dragonfire.svg
index a95f5d973..350492649 100644
--- a/misc/minetest.svg
+++ b/misc/dragonfire.svg
@@ -12,8 +12,8 @@
    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)">
+   sodipodi:docname="dragonfire.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
   <defs
      id="defs2" />
   <sodipodi:namedview
@@ -24,8 +24,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.49497475"
-     inkscape:cx="241.93184"
-     inkscape:cy="805.35667"
+     inkscape:cx="821.97201"
+     inkscape:cy="1504.5142"
      inkscape:document-units="mm"
      inkscape:current-layer="layer2"
      inkscape:document-rotation="0"
@@ -37,9 +37,9 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1920"
-     inkscape:window-height="1056"
+     inkscape:window-height="1009"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="42"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata5">
@@ -49,7 +49,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>
@@ -75,10 +75,11 @@
        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"
+       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)"
-       sodipodi:nodetypes="csssscssssscsscssscsscccsssccscc" />
+       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"
diff --git a/misc/minetest-icon-24x24.png b/misc/minetest-icon-24x24.png
deleted file mode 100644
index 39c5b8e5f..000000000
--- a/misc/minetest-icon-24x24.png
+++ /dev/null
diff --git a/misc/minetest-icon.ico b/misc/minetest-icon.ico
deleted file mode 100644
index 53308b356..000000000
--- a/misc/minetest-icon.ico
+++ /dev/null
diff --git a/misc/minetest-xorg-icon-128.png b/misc/minetest-xorg-icon-128.png
deleted file mode 100644
index 9cf15a00a..000000000
--- a/misc/minetest-xorg-icon-128.png
+++ /dev/null
diff --git a/misc/net.minetest.minetest.desktop b/misc/net.minetest.minetest.desktop
index ca493c44e..737dfb29e 100644..100755
--- 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 e1e82581b..bd93be91d 100644
--- a/misc/winresource.rc
+++ b/misc/winresource.rc
@@ -14,7 +14,7 @@
 #endif

 

 LANGUAGE 0, SUBLANG_NEUTRAL

-130        ICON         "minetest-icon.ico"

+130        ICON         "dragonfire-icon.ico"

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp
index f5aca8f58..22c8a8102 100644
--- 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 48793678f..5284900b2 100644
--- a/textures/base/pack/logo.png
+++ b/textures/base/pack/logo.png