Merge branch 'master' into 'master'

Add minetest 0.4.14 and correct icon license for minetest mod manager

Two things in one MR, please write if I should split them up.

See merge request !1415
This commit is contained in:
Boris Kraut 2016-05-15 15:27:53 +00:00
commit 33acac8b21
2 changed files with 10 additions and 8 deletions

View file

@ -1,7 +1,6 @@
AntiFeatures:NonFreeAssets
Categories:Games
License:LGPLv2.1+
Author Name:Rubenwardy
Author Name:rubenwardy
Web Site:http://rubenwardy.com/mtmods4android/
Source Code:https://github.com/rubenwardy/mtmods4android
Issue Tracker:https://github.com/rubenwardy/mtmods4android/issues
@ -14,10 +13,6 @@ Install and update Minetest mods.
The app depends on a free network service, see
[https://github.com/rubenwardy/mtmods4android_server source code] and
[http://app-mtmm.rubenwardy.com/ website] for more details.
'''AntiFeatures:'''
* non-free assets are used: All resources featuring the Minetest logo are CC-BY-SA-NC, original author is erlehmann. Also CC-BY-3.0 licensed assets from [http://shreyasachar.com/AndroidAssetStudio/attribution.html Android material design asset studio] have been used for app/src/main/res/drawable/ic_public_24dp.xml and app/src/main/res/drawable/ic_report_problem_24dp.xml.
.
Repo Type:git

View file

@ -49,7 +49,14 @@ Build:0.4.13.13,13
build=printf "%s\n%s\n%s" "ANDROID_NDK = $$NDK$$" "NDK_MODULE_PATH = $$NDK$$/toolchains" "SDKFOLDER = $$SDK$$" > path.cfg && \
make release
Build:0.4.14.14,14
commit=854d9e3745304f5f420805818de99e5e6d1b2596
subdir=build/android
output=build/outputs/apk/Minetest-release-unsigned.apk
srclibs=MinetestGame@e7a55734d3de051d6565ebe28a9dd53043f9b352
prebuild=cp -R $$MinetestGame$$ ../../games/minetest_game
build=printf "%s\n%s" "ndk.dir = $$NDK$$" "sdk.dir = $$SDK$$" > local.properties && \
make release
Auto Update Mode:None
Update Check Mode:None
Current Version:0.4.13.13
Current Version Code:13