Merge branch 'master' into 1.6-dev.unstable

This commit is contained in:
Ben Peddell 2016-07-30 03:40:37 +10:00
commit 8c90bbfb51
2 changed files with 5 additions and 1 deletions

View File

@ -458,7 +458,7 @@ Instance config files
Instance config files are stored under Instance config files are stored under
`/etc/arkmanager/instances/<instancename>.cfg`, `/etc/arkmanager/instances/<instancename>.cfg`,
`~/.local/config/arkmanager/instances/<instancename>.cfg` `~/.config/arkmanager/instances/<instancename>.cfg`
or as specified in the `configfile_<instancename>` options in or as specified in the `configfile_<instancename>` options in
the global config. the global config.

View File

@ -1533,6 +1533,10 @@ doDownloadMod(){
# #
doDownloadAllMods(){ doDownloadAllMods(){
for modid in $(getModIds); do for modid in $(getModIds); do
# Bypass the 111111111 modid used by Primitive+
if [ "$modid" = "111111111" ]; then
continue
fi
doDownloadMod $modid || return 1 doDownloadMod $modid || return 1
done done
} }