Merge branch 'master' of https://gitlab.com/jdolan/netradiant

diff --combined Makefile
index 51b3fa9fa77d063d2cd679018cb321d26281c87a,1fe334df7457a43184c1335cc3792db9e32e03fe..a68f3c61410274c1ff28c2ca7aa39b63908f5946
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -233,8 -233,6 +233,6 @@@ ifeq ($(OS),Darwin
        # workaround: we have no "ldd" for OS X, so...
        LDD =
        OTOOL = otool
- 
-       INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install
  else
  
  $(error Unsupported build OS: $(OS))
@@@ -536,7 -534,6 +534,7 @@@ $(INSTALLDIR)/q3map2.$(EXE): 
        tools/quake3/q3map2/vis.o \
        tools/quake3/q3map2/writebsp.o \
        libddslib.$(A) \
 +      libetclib.$(A) \
        libfilematch.$(A) \
        libl_net.$(A) \
        libmathlib.$(A) \
@@@ -586,10 -583,6 +584,10 @@@ libddslib.$(A): CPPFLAGS_EXTRA := -Ilib
  libddslib.$(A): \
        libs/ddslib/ddslib.o \
  
 +libetclib.$(A): CPPFLAGS_EXTRA := -Ilibs
 +libetclib.$(A): \
 +      libs/etclib.o \
 +
  $(INSTALLDIR)/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_ZLIB)
  $(INSTALLDIR)/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_ZLIB) -Itools/quake3/common -Ilibs -Iinclude
  $(INSTALLDIR)/q3data.$(EXE): \
@@@ -614,7 -607,6 +612,7 @@@
        tools/quake3/q3data/stripper.o \
        tools/quake3/q3data/video.o \
        libfilematch.$(A) \
 +      libetclib.$(A) \
        libl_net.$(A) \
        libmathlib.$(A) \
        $(if $(findstring $(OS),Win32),icons/q3data.o,) \
@@@ -809,11 -801,9 +807,11 @@@ $(INSTALLDIR)/modules/image.$(DLL): 
        plugins/image/dds.o \
        plugins/image/image.o \
        plugins/image/jpeg.o \
 +      plugins/image/ktx.o \
        plugins/image/pcx.o \
        plugins/image/tga.o \
        libddslib.$(A) \
 +      libetclib.$(A) \
  
  $(INSTALLDIR)/modules/imageq2.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude
  $(INSTALLDIR)/modules/imageq2.$(DLL): \
@@@ -1053,7 -1043,6 +1051,6 @@@ $(INSTALLDIR)/heretic2/h2data.$(EXE): 
  install-data: binaries
        $(MKDIR) $(INSTALLDIR)/games
        $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
-       [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/
        DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIPPER="$(UNZIPPER)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)"
        $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
        $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
@@@ -1067,14 -1056,9 +1064,9 @@@ ifeq ($(OS),Win32
  install-dll: binaries
        MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) 
  else
- ifeq ($(OS),Darwin)
- install-dll: binaries
-       EXE="$(EXE)" MACLIBDIR="$(MACLIBDIR)" CP="$(CP)" OTOOL="$(OTOOL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dylibs.sh
- else
  install-dll: binaries
        @$(ECHO) No DLL inclusion implemented for this target.
  endif
- endif
  
  # release building... NOT for general users
  # these may use tools not in the list that is checked by the build system

diff --combined download-gamepacks.sh
index ff5b9840cd14a9e7320702fe360e72504b3cebb5,d573d60f3d599ded91989ae2d29016be82ee24ac..1988972b801f2dec2531d2f043ee16f41b9ced02
--- 1/download-gamepacks.sh
--- 2/download-gamepacks.sh
+++ b/download-gamepacks.sh
@@@ -153,11 -153,10 +153,11 @@@ pack OpenArenaPack   unknown     zip
  pack OsirionPack     GPL         zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/OsirionPack.zip
  pack Q3Pack          proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk/ -r29
  pack Quake2Pack      proprietary zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/Quake2Pack.zip
- pack Quake2WorldPack GPL         svn    svn://jdolan.dyndns.org/quake2world/trunk/gtkradiant
+ pack Quake2WorldPack GPL         svn    svn://svn.icculus.org/gtkradiant-gamepacks/Q2WPack/branches/1.5/
  pack QuakePack       GPL         zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/Quake1Pack.zip
  pack TremulousPack   proprietary zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/TremulousPack.zip
  pack UFOAIPack       proprietary svn    svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/branches/1.5/
  #pack WarsowPack     GPL         svn    https://svn.bountysource.com/wswpack/trunk/netradiant/games/WarsowPack/
 -pack WarsowPack      GPL         zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/WarsowPack.zip
 +#pack WarsowPack     GPL         zip1   http://ingar.satgnu.net/files/gtkradiant/gamepacks/WarsowPack.zip
 +pack WarsowPack      GPL         git    https://github.com/Warsow/NetRadiantPack.git
  pack XonoticPack     GPL         git    http://git.xonotic.org/xonotic/netradiant-xonoticpack.git