Merge branch 'master' into matthiaskrgr/all_map_pk3

Conflicts:
	misc/tools/all/xonotic.subr

diff --cc misc/tools/all/xonotic.subr
index 39d48ae7eef4c65b2d83df84e99b03f529b24555,63f7efbd7c4811d52ff05f0b55b0935d2aa45d57..e140fdd4336ba7e0a2fec6bb3146fe2b134b7640
--- 1/misc/tools/all/xonotic.subr
--- 2/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@@ -3,17 -3,16 +3,17 @@@ case "$cmd" i
        update-maps)
                misc/tools/xonotic-map-compiler-autobuild download
                ;;
 -      compile-map)
 +      compile-map-pk3)
                if [ $# -eq 0 ] ; then
 -                      msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
 -                      msg "For example: ./all compile-map dance xoylent"
 +                      msg "Usage: ./all compile-map-pk3 mapname1 mapname2 mapname3"
 +                      msg "For example: ./all compile-map-pk3 dance xoylent"
                fi
-               if ! [ -f "netradiant/install/q3map2.x86" ] ; then
-                       msg "q3map2 needed! Building..."
-                       make -C netradiant install/q3map2.x86
+               if ! [ -f "netradiant/install/q3map2" ] ; then
+                       msg "q3map2 needed! Building netradiant..."
+                       make -C netradiant install/q3map2
                fi
                for mapfile in "$@"; do
 +                      mapname=$mapfile
                        mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
                        if [ ! -f "$mapfile" ] ; then
                                msg "ERROR, $mapfile not found!"