diff --git a/.gitignore b/.gitignore index cb225dc8..4bbdf506 100644 --- a/.gitignore +++ b/.gitignore @@ -80,7 +80,7 @@ timestamp ## iOS build files build/iOS/MultiCraft/MultiCraft.xcodeproj/xcuserdata build/iOS/MultiCraft/MultiCraft.xcodeproj/project.xcworkspace -build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/*.png +# build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/*.png build/iOS/MultiCraft.xcworkspace build/iOS/Pods build/iOS/Podfile.lock diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cb9e8ab..40bb5bf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,7 @@ if(UNIX AND NOT APPLE) install(FILES "misc/MultiCraft.appdata.xml" DESTINATION "${APPDATADIR}") install(FILES "misc/MultiCraft.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") # ToDo - install(FILES "misc/minetest-xorg-icon-128.png" + install(FILES "misc/MultiCraft-xorg-icon-128.png" DESTINATION "${ICONDIR}/hicolor/128x128/apps" RENAME "minetest.png") endif() diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-120.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-120.png new file mode 100644 index 00000000..5ee797f3 Binary files /dev/null and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-120.png differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-152.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-152.png new file mode 100644 index 00000000..e88714d0 Binary files /dev/null and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-152.png differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-167.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-167.png new file mode 100644 index 00000000..cf6f27a1 Binary files /dev/null and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-167.png differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-180.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-180.png new file mode 100644 index 00000000..06d60305 Binary files /dev/null and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-180.png differ diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-76.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-76.png new file mode 100644 index 00000000..e0cca06a Binary files /dev/null and b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/ios-temp/AppIcon-76.png differ diff --git a/build/iOS/Start.sh b/build/iOS/Start.sh index 9d59f429..0cc303ed 100755 --- a/build/iOS/Start.sh +++ b/build/iOS/Start.sh @@ -16,7 +16,8 @@ echo "Creating Assets:" echo echo "Creating App Icon:" -./appicon.sh +echo "Skipping!" +#./appicon.sh echo echo "Install CocoaPods:" diff --git a/misc/MultiCraft-xorg-icon-128.png b/misc/MultiCraft-xorg-icon-128.png new file mode 100644 index 00000000..45760d62 Binary files /dev/null and b/misc/MultiCraft-xorg-icon-128.png differ diff --git a/misc/MultiCraft.ico b/misc/MultiCraft.ico index 75cd707a..f315feab 100644 Binary files a/misc/MultiCraft.ico and b/misc/MultiCraft.ico differ diff --git a/misc/minetest-xorg-icon-128.png b/misc/minetest-xorg-icon-128.png deleted file mode 100644 index 0241a911..00000000 Binary files a/misc/minetest-xorg-icon-128.png and /dev/null differ diff --git a/textures/base/no_screenshot.png b/textures/base/no_screenshot.png index 8c708989..5ec97905 100644 Binary files a/textures/base/no_screenshot.png and b/textures/base/no_screenshot.png differ