From f9bd26c040d421e1e7fcfce4b75d0bf00cc2166b Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sat, 14 Feb 2015 08:53:52 -0500
Subject: [PATCH 01/11] Kill old Radiant Apple skeleton.

---
 .../osx/NetRadiant.app/Contents/Info.plist    |  18 --
 .../Contents/MacOS/install/fonts.conf         | 150 ------------
 .../Contents/MacOS/install/fonts.dtd          | 224 ------------------
 .../Contents/MacOS/install/gdk-pixbuf.loaders |  12 -
 .../Contents/MacOS/install/pango.modules      |   7 -
 .../Contents/MacOS/install/pangorc            |   5 -
 .../Contents/MacOS/install/pangox.aliases     | 220 -----------------
 .../data/osx/NetRadiant.app/Contents/PkgInfo  |   1 -
 .../Resources/English.lproj/InfoPlist.strings | Bin 478 -> 0 bytes
 .../Contents/Resources/NetRadiant.icns        | Bin 34748 -> 0 bytes
 10 files changed, 637 deletions(-)
 delete mode 100644 setup/data/osx/NetRadiant.app/Contents/Info.plist
 delete mode 100755 setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf
 delete mode 100755 setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.dtd
 delete mode 100644 setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders
 delete mode 100644 setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules
 delete mode 100644 setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc
 delete mode 100644 setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases
 delete mode 100644 setup/data/osx/NetRadiant.app/Contents/PkgInfo
 delete mode 100755 setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings
 delete mode 100644 setup/data/osx/NetRadiant.app/Contents/Resources/NetRadiant.icns

diff --git a/setup/data/osx/NetRadiant.app/Contents/Info.plist b/setup/data/osx/NetRadiant.app/Contents/Info.plist
deleted file mode 100644
index 81e377d1..00000000
--- a/setup/data/osx/NetRadiant.app/Contents/Info.plist
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>netradiant.sh</string>
-	<key>CFBundleIconFile</key>
-	<string>NetRadiant</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.5.0</string>
-</dict>
-</plist>
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf
deleted file mode 100755
index 86dc8af2..00000000
--- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/fonts.conf file to configure system font access -->
-<fontconfig>
-
-<!--
-	DO NOT EDIT THIS FILE.
-	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
-	LOCAL CHANGES BELONG IN 'local.conf'.
-
-	The intent of this standard configuration file is to be adequate for
-	most environments.  If you have a reasonably normal environment and
-	have found problems with this configuration, they are probably
-	things that others will also want fixed.  Please submit any
-	problems to the fontconfig bugzilla system located at fontconfig.org
-
-	Note that the normal 'make install' procedure for fontconfig is to
-	replace any existing fonts.conf file with the new version.  Place
-	any local customizations in local.conf which this file references.
-
-	Keith Packard
--->
-
-<!-- Font directory list -->
-
-	<dir>/usr/share/fonts</dir>
-	<dir>/usr/X11/lib/X11/fonts</dir> <dir>/Library/Fonts</dir> <dir>/Network/Library/Fonts</dir> <dir>/System/Library/Fonts</dir> <dir>/opt/local/share/fonts</dir>
-	<dir>~/.fonts</dir>
-
-<!--
-  Accept deprecated 'mono' alias, replacing it with 'monospace'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>mono</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>monospace</string>
-		</edit>
-	</match>
-
-<!--
-  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>sans serif</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>sans</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  Load local system customization file
--->
-	<include ignore_missing="yes">conf.d</include>
-
-<!-- Font cache directory list -->
-
-	<cachedir>~/.fontconfig</cachedir>
-
-	<config>
-<!--
-  These are the default Unicode chars that are expected to be blank
-  in fonts.  All other blank chars are assumed to be broken and
-  won't appear in the resulting charsets
- -->
-		<blank>
-			<int>0x0020</int>	<!-- SPACE -->
-			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
-			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
-			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
-			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
-			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
-			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
-			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
-			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
-			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
-			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
-			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
-			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
-			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
-			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
-			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
-			<int>0x2000</int>	<!-- EN QUAD -->
-			<int>0x2001</int>	<!-- EM QUAD -->
-			<int>0x2002</int>	<!-- EN SPACE -->
-			<int>0x2003</int>	<!-- EM SPACE -->
-			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
-			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
-			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
-			<int>0x2007</int>	<!-- FIGURE SPACE -->
-			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
-			<int>0x2009</int>	<!-- THIN SPACE -->
-			<int>0x200A</int>	<!-- HAIR SPACE -->
-			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
-			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
-			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
-			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
-			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
-			<int>0x2028</int>	<!-- LINE SEPARATOR -->
-			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
-			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
-			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
-			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
-			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
-			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
-			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
-			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
-			<int>0x2060</int>	<!-- WORD JOINER -->
-			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
-			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
-			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
-			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
-			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
-			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
-			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
-			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
-			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
-			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
-			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
-			<int>0x3164</int>	<!-- HANGUL FILLER -->
-			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
-			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
-			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
-			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
-			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
-		</blank>
-<!--
-  Rescan configuration every 30 seconds when FcFontSetList is called
- -->
-		<rescan>
-			<int>30</int>
-		</rescan>
-	</config>
-
-</fontconfig>
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.dtd b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.dtd
deleted file mode 100755
index cbdfdab3..00000000
--- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.dtd
+++ /dev/null
@@ -1,224 +0,0 @@
-<!-- This is the Document Type Definition for font configuration files -->
-<!ELEMENT fontconfig (dir | 
-		      cache | 
-		      cachedir |
-		      include | 
-		      config |
-		      selectfont |
-		      match | 
-		      alias)* >
-
-<!-- 
-    Add a directory that provides fonts
--->
-<!ELEMENT dir (#PCDATA)>
-<!ATTLIST dir xml:space (default|preserve) 'preserve'>
-
-<!--
-    Define the per-user file that holds cache font information.
-
-    If the filename begins with '~', it is replaced with the users
-    home directory path.
--->
-<!ELEMENT cache (#PCDATA)>
-<!ATTLIST cache xml:space (default|preserve) 'preserve'>
-
-<!--
-    Add a directory that is searched for font cache files.
-    These hold per-directory cache data and are searched in
-    order for each directory. When writing cache files, the first
-    directory which allows the cache file to be created is used.
-
-    A leading '~' in a directory name is replaced with the users
-    home directory path.
--->
-<!ELEMENT cachedir (#PCDATA)>
-<!ATTLIST cachedir xml:space (default|preserve) 'preserve'>
-
-<!--
-    Reference another configuration file; note that this
-    is another complete font configuration file and not
-    just a file included by the XML parser.
-
-    Set 'ignore_missing' to 'yes' if errors are to be ignored.
-
-    If the filename begins with '~', it is replaced with the users
-    home directory path.
--->
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
-	  ignore_missing    (no|yes)		"no"
-	  xml:space	    (default|preserve)	"preserve">
-
-<!--
-    Global library configuration data
- -->
-<!ELEMENT config (blank|rescan)*>
-
-<!--
-    Specify the set of Unicode encoding values which
-    represent glyphs that are allowed to contain no
-    data.  With this list, fontconfig can examine
-    fonts for broken glyphs and eliminate them from
-    the set of valid Unicode chars.  This idea
-    was borrowed from Mozilla
- -->
-<!ELEMENT blank (int)*>
-
-<!--
-    Aliases are just a special case for multiple match elements
-
-    They are syntactically equivalent to:
-
-    <match>
-	<test name="family">
-	    <string value=[family]/>
-	</test>
-	<edit name="family" mode="prepend">
-	    <string value=[prefer]/>
-	    ...
-	</edit>
-	<edit name="family" mode="append">
-	    <string value=[accept]/>
-	    ...
-	</edit>
-	<edit name="family" mode="append_last">
-	    <string value=[default]/>
-	    ...
-	</edit>
-    </match>
--->
-<!--
-    Periodically rescan the font configuration and
-    directories to synch internal state with filesystem
- -->
-<!ELEMENT rescan (int)>
-
-<!--
-    Edit list of available fonts at startup/reload time
- -->
-<!ELEMENT selectfont (rejectfont | acceptfont)* >
-
-<!ELEMENT rejectfont (glob | pattern)*>
-
-<!ELEMENT acceptfont (glob | pattern)*>
-
-<!ELEMENT glob (#PCDATA)>
-
-<!ELEMENT pattern (patelt)*>
-
-<!ENTITY % constant 'int|double|string|matrix|bool|charset|const'>
-
-<!ELEMENT patelt (%constant;)*>
-<!ATTLIST patelt
-	  name CDATA	#REQUIRED>
-
-<!ELEMENT alias (family*, prefer?, accept?, default?)>
-<!ATTLIST alias
-	  binding (weak|strong|same) "weak">
-<!ELEMENT prefer (family)*>
-<!ELEMENT accept (family)*>
-<!ELEMENT default (family)*>
-<!ELEMENT family (#PCDATA)>
-<!ATTLIST family xml:space (default|preserve) 'preserve'>
-
-<!ENTITY % expr 'int|double|string|matrix|bool|charset
-		|name|const
-		|or|and|eq|not_eq|less|less_eq|more|more_eq|contains|not_contains
-		|plus|minus|times|divide|not|if|floor|ceil|round|trunc'>
-
-<!--
-    Match and edit patterns.
-
-    If 'target' is 'pattern', execute the match before selecting a font.
-    if 'target' is 'font', execute the match on the result of a font
-    selection.
--->
-<!ELEMENT match (test*, edit*)>
-<!ATTLIST match
-	  target (pattern|font|scan) "pattern">
-
-<!--
-    Match a field in a pattern
-
-    if 'qual' is 'any', then the match succeeds if any value in the field matches.
-    if 'qual' is 'all', then the match succeeds only if all values match.
-    if 'qual' is 'first', then the match succeeds only if the first value matches.
-    if 'qual' is 'not_first', then the match succeeds only if any value other than
-    	the first matches.
-    For match elements with target=font, if test 'target' is 'pattern',
-    then the test is applied to the pattern used in matching rather than
-    to the resulting font.
-
-    Match elements with target=scan are applied as fonts are scanned.
-    They edit the pattern generated from the scanned font and affect
-    what the fontconfig database contains.
--->
-<!ELEMENT test (%expr;)*>
-<!ATTLIST test 
-	  qual (any|all|first|not_first)    "any"
-	  name CDATA	    #REQUIRED
-	  target (pattern|font|default)		"default"
-	  compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains)	"eq">
-
-<!--
-    Edit a field in a pattern
-
-    The enclosed values are used together to edit the list of values
-    associated with 'name'.
-
-    If 'name' matches one of those used in a test element for this match element:
-	if 'mode' is 'assign', replace the matched value.
-	if 'mode' is 'assign_replace', replace all of the values
-	if 'mode' is 'prepend', insert before the matched value
-	if 'mode' is 'append', insert after the matched value
-	if 'mode' is 'prepend_first', insert before all of the values
-	if 'mode' is 'append_last', insert after all of the values
-    If 'name' doesn't match any of those used in a test element:
-	if 'mode' is 'assign' or 'assign_replace, replace all of the values
-	if 'mode' is 'prepend' or 'prepend_first', insert before all of the values
-	if 'mode' is 'append' or 'append_last', insert after all of the values
--->
-<!ELEMENT edit (%expr;)*>
-<!ATTLIST edit
-	  name CDATA	    #REQUIRED
-	  mode (assign|assign_replace|prepend|append|prepend_first|append_last) "assign"
-	  binding (weak|strong|same) "weak">
-
-<!--
-    Elements of expressions follow
--->
-<!ELEMENT int (#PCDATA)>
-<!ATTLIST int xml:space (default|preserve) 'preserve'>
-<!ELEMENT double (#PCDATA)>
-<!ATTLIST double xml:space (default|preserve) 'preserve'>
-<!ELEMENT string (#PCDATA)>
-<!ATTLIST string xml:space (default|preserve) 'preserve'>
-<!ELEMENT matrix (double,double,double,double)>
-<!ELEMENT bool (#PCDATA)>
-<!ELEMENT charset (#PCDATA)>
-<!ATTLIST charset xml:space (default|preserve) 'preserve'>
-<!ELEMENT name (#PCDATA)>
-<!ATTLIST name xml:space (default|preserve) 'preserve'>
-<!ELEMENT const (#PCDATA)>
-<!ATTLIST const xml:space (default|preserve) 'preserve'>
-<!ELEMENT or (%expr;)*>
-<!ELEMENT and (%expr;)*>
-<!ELEMENT eq ((%expr;), (%expr;))>
-<!ELEMENT not_eq ((%expr;), (%expr;))>
-<!ELEMENT less ((%expr;), (%expr;))>
-<!ELEMENT less_eq ((%expr;), (%expr;))>
-<!ELEMENT more ((%expr;), (%expr;))>
-<!ELEMENT more_eq ((%expr;), (%expr;))>
-<!ELEMENT contains ((%expr;), (%expr;))>
-<!ELEMENT not_contains ((%expr;), (%expr;))>
-<!ELEMENT plus (%expr;)*>
-<!ELEMENT minus (%expr;)*>
-<!ELEMENT times (%expr;)*>
-<!ELEMENT divide (%expr;)*>
-<!ELEMENT not (%expr;)>
-<!ELEMENT if ((%expr;), (%expr;), (%expr;))>
-<!ELEMENT floor (%expr;)>
-<!ELEMENT ceil (%expr;)>
-<!ELEMENT round (%expr;)>
-<!ELEMENT trunc (%expr;)>
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders
deleted file mode 100644
index f8852a26..00000000
--- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders
+++ /dev/null
@@ -1,12 +0,0 @@
-# GdkPixbuf Image Loader Modules file
-# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders from gtk+-2.6.10
-#
-# LoaderDir = /sw.haha/lib/gtk-2.0/2.4.0/loaders
-#
-"./libpixbufloader-bmp.so"
-"bmp" 5 "gtk20" "The BMP image format"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules
deleted file mode 100644
index 9eecea48..00000000
--- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Pango Modules file
-# Automatically generated file, do not edit
-#
-# ModulesPath = /sw.haha/lib/pango/1.4.0/modules
-#
-./pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc armenian:* bopomofo:* cherokee:* coptic:* cyrillic:* deseret:* ethiopic:* georgian:* gothic:* greek:* han:* hiragana:* katakana:* latin:* ogham:* old-italic:* runic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* common:
-./pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common:
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc
deleted file mode 100644
index 282e977e..00000000
--- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc
+++ /dev/null
@@ -1,5 +0,0 @@
-[Pango]
-ModuleFiles = ./pango.modules
-
-[PangoX]
-AliasFiles = ./pangox.aliases
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases
deleted file mode 100644
index 9b41aa75..00000000
--- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases
+++ /dev/null
@@ -1,220 +0,0 @@
-# File defining aliases of PangoFontDescription to X font set
-#
-# family style variant weight stretch   XLFD
-
-sans normal normal normal normal \
-  "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -*-gulim-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-sans italic normal normal normal \
-  "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\
-   -*-gulim-medium-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-sans normal normal bold normal \
-  "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\
-   -*-gulim-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-sans italic normal bold normal \
-  "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\
-   -*-gulim-bold-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-
-serif normal normal normal normal \
-  "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-serif italic normal normal normal \
-  "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\
-   -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-serif normal normal bold normal \
-  "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\
-   -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-serif italic normal bold normal \
-  "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\
-   -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-monospace normal normal normal normal \
-  "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-monospace italic normal normal normal \
-  "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\
-   -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-monospace normal normal bold normal \
-  "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\
-   -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-monospace italic normal bold normal \
-  "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\
-   -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-   -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
diff --git a/setup/data/osx/NetRadiant.app/Contents/PkgInfo b/setup/data/osx/NetRadiant.app/Contents/PkgInfo
deleted file mode 100644
index bd04210f..00000000
--- a/setup/data/osx/NetRadiant.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings b/setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings
deleted file mode 100755
index 4a182e50da66b31bbc61001a63ed220ca34ec94f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 478
zcmezOpFy8Ni$Q_GhasOKnIVxOhar=piXoLDg+YO#j3Jewh@qGvlOdlWkD-`BfgztE
zjX{CIlOc~GjUk^wkD&mpzL=qeL4hHgA(f#LtV)YPpMi^ki@}+}jlqeblp&8Hg&~I_
zmBEi8ks+5Ml|g~QmO+6*iNTK{m7#<oh#`?7g&~t6ks*(vgh7eH8jH?gh75*$h9ZU%
zhA<R21v8W|6ftBn<T0efO*LfDV=!gVV=%yBmOI#1m>;m2fX!VB3<z@-7&I6%7)lsQ
z7z!Ay81xzR8Op&>k0FyGnIV~>lp%+ql%beG5A5c227QJ+u$@IHKGkQ?gu2j=A(+8~
vp_CyP90oxQsbF=93`yWnb7shAC}5}r`!gMEFD(49$rv#hFc>gcLQDn#sP0h?

diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/NetRadiant.icns b/setup/data/osx/NetRadiant.app/Contents/Resources/NetRadiant.icns
deleted file mode 100644
index 339e718df85aa54359966eb5850b6e56e70962f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34748
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
Q&D6pI%NkcKDo45y0KM_;_y7O^


From f16cac36d647c8a8cbc4f904d9be65222e6f8f05 Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sat, 14 Feb 2015 09:37:38 -0500
Subject: [PATCH 02/11] New Apple OS X application bundle based on work done
 for GtkRadiant 1.6.4. Produces a functioning application on Yosemite.

---
 setup/data/osx/Makefile                       |  83 +++++++++++
 .../osx/NetRadiant.app/Contents/Info.plist    |  28 ++++
 .../osx/NetRadiant.app/Contents/MacOS/radiant |  35 +++++
 .../Contents/Resources/etc/fonts/fonts.conf   | 133 ++++++++++++++++++
 .../Contents/Resources/etc/gtk-2.0/gtkrc      |   0
 .../Contents/Resources/etc/pango/pangorc      |   1 +
 .../Contents/Resources/lib/.turd              |   0
 .../Contents/Resources/radiant.icns           | Bin 0 -> 34748 bytes
 .../Resources/share/gtk-2.0/icons/.turd       |   0
 .../Resources/share/gtk-2.0/themes/.turd      |   0
 setup/data/osx/README.md                      |  50 +++++++
 11 files changed, 330 insertions(+)
 create mode 100644 setup/data/osx/Makefile
 create mode 100644 setup/data/osx/NetRadiant.app/Contents/Info.plist
 create mode 100755 setup/data/osx/NetRadiant.app/Contents/MacOS/radiant
 create mode 100644 setup/data/osx/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf
 create mode 100644 setup/data/osx/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc
 create mode 100644 setup/data/osx/NetRadiant.app/Contents/Resources/etc/pango/pangorc
 create mode 100644 setup/data/osx/NetRadiant.app/Contents/Resources/lib/.turd
 create mode 100644 setup/data/osx/NetRadiant.app/Contents/Resources/radiant.icns
 create mode 100644 setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd
 create mode 100644 setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd
 create mode 100644 setup/data/osx/README.md

diff --git a/setup/data/osx/Makefile b/setup/data/osx/Makefile
new file mode 100644
index 00000000..eb9ecadf
--- /dev/null
+++ b/setup/data/osx/Makefile
@@ -0,0 +1,83 @@
+# Makefile for NetRadiant.app, requires http://macdylibbundler.sourceforge.net/
+
+INSTALL = ../../../install
+TARGET = target
+RESOURCES = $(TARGET)/NetRadiant.app/Contents/Resources
+BINDIR = $(RESOURCES)/install
+CONFDIR = $(RESOURCES)/etc
+DATADIR = $(RESOURCES)/share
+LIBDIR = $(RESOURCES)/lib
+VERSION = 1.5.0
+DMG = $(TARGET)/NetRadiant-$(VERSION).dmg
+VOLUME_NAME = "NetRadiant $(VERSION)"
+
+# We must rewrite some Gtk configuration files, which vary from environment to
+# environment depending on where you've installed MacPorts. Fun!
+
+MACPORTS_PREFIX := $(shell which port | sed 's:/bin/port::')
+PREFIX_SED_EXPR = "s:$(MACPORTS_PREFIX):@executable_path/..:g"
+
+all: install bundle
+
+-pre-install:
+	install -d $(TARGET)
+	cp -r NetRadiant.app $(TARGET)
+	find $(TARGET) -name .turd -delete
+	
+-gtk-runtime-gdk-pixbuf-2.0:
+	cp -r $(MACPORTS_PREFIX)/lib/gdk-pixbuf-2.0 $(LIBDIR)
+	find $(LIBDIR)/gdk-pixbuf-2.0 -type f ! -name "*.so" -delete
+	
+	gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \
+		$(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders
+
+-gtk-runtime-pango:
+	cp -r $(MACPORTS_PREFIX)/lib/pango $(LIBDIR)
+	find $(LIBDIR)/pango -type f ! -name "*.so" -delete
+	
+	pango-querymodules | sed $(PREFIX_SED_EXPR) > \
+		$(CONFDIR)/pango/pango.modules
+	
+-gtk-runtime: -gtk-runtime-gdk-pixbuf-2.0 -gtk-runtime-pango
+	cp -r $(MACPORTS_PREFIX)/lib/gtk-2.0 $(LIBDIR)
+	find $(LIBDIR)/gtk-2.0 -type f ! -name "*.so" -delete	
+	
+	rm -rf $(LIBDIR)/gtk-2.0/{includes,modules}
+	rm -rf $(LIBDIR)/gtk-2.0/*/printbackends
+	
+	cp -r $(MACPORTS_PREFIX)/share/themes/Default $(RESOURCES)/share
+	
+	gtk-query-immodules-2.0 | sed $(PREFIX_SED_EXPR) > \
+		$(CONFDIR)/gtk-2.0/gtk.immodules
+
+install: -pre-install -gtk-runtime
+	cp -r $(INSTALL) $(RESOURCES)
+	#rm -rf `find $(INSTDIR)/installs -type d -name .svn`
+
+bundle:
+	
+	# The Radiant plugins (modules) are a little funky
+	# Some of them are actually linked against the build directory
+	
+	test -L install || ln -s $(INSTALL)
+	
+	dylibbundler -b \
+		-x $(BINDIR)/radiant \
+		-x $(BINDIR)/q2map \
+		-x $(BINDIR)/q3data \
+		-x $(BINDIR)/q3map2 \
+		-x $(BINDIR)/qdata3 \
+		`find $(BINDIR)/modules -name "*.dylib" | xargs -I {} echo -x {}` \
+		`find $(LIBDIR) -name "*.dylib" | xargs -I {} echo -x {}` \
+	-d $(LIBDIR) -of -p @executable_path/../lib
+	
+	rm -f install
+
+image:
+	find $(TARGET) -name .DS_Store -delete
+	ln -f -s /Applications $(TARGET)/Applications
+	hdiutil create -ov $(DMG) -srcfolder $(TARGET) -volname $(VOLUME_NAME)
+	rm $(TARGET)/Applications
+
+clean:
+	rm -rf $(TARGET)/*
diff --git a/setup/data/osx/NetRadiant.app/Contents/Info.plist b/setup/data/osx/NetRadiant.app/Contents/Info.plist
new file mode 100644
index 00000000..75796b16
--- /dev/null
+++ b/setup/data/osx/NetRadiant.app/Contents/Info.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>English</string>
+        <key>CFBundleDisplayName</key>
+        <string>NetRadiant</string>
+        <key>CFBundleExecutable</key>
+        <string>radiant</string>
+        <key>CFBundleIconFile</key>
+        <string>radiant.icns</string>
+        <key>CFBundleIdentifier</key>
+        <string>org.xonotic.netradiant</string>
+        <key>CFBundleName</key>
+        <string>NetRadiant</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.5.0</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>1.5.0</string>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.7</string>
+</dict>
+</plist>
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/radiant b/setup/data/osx/NetRadiant.app/Contents/MacOS/radiant
new file mode 100755
index 00000000..701a7fec
--- /dev/null
+++ b/setup/data/osx/NetRadiant.app/Contents/MacOS/radiant
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+RADIANT_HOME=$(dirname "$0")
+RADIANT_HOME=${RADIANT_HOME/NetRadiant.app*/NetRadiant.app}
+
+echo
+echo "Starting NetRadiant in ${RADIANT_HOME}"
+echo
+
+set -x
+
+resources="${RADIANT_HOME}/Contents/Resources"
+
+export FONTCONFIG_PATH="${resources}/etc/fonts"
+export FC_DEBUG=1024
+
+export GDK_GL_LIBGL_PATH="${resources}/lib/libGL.1.dylib"
+export GDK_GL_LIBGLU_PATH="${resources}/lib/libGLU.1.dylib"
+
+export GDK_PATH="${resources}"
+export GDK_PIXBUF_MODULE_FILE="${resources}/etc/gtk-2.0/gdk-pixbuf.loaders"
+
+export GOBJECT_PATH="${resources}"
+
+export GTK_DATA_PREFIX="${resources}"
+export GTK_EXE_PREFIX="${resources}"
+export GTK_PATH="${resources}"
+
+export PANGO_SYSCONFDIR="${resources}/etc"
+export PANGO_LIBDIR="${resources}/lib"
+
+cd "${resources}/install"
+./radiant &
+
+set +x
\ No newline at end of file
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf b/setup/data/osx/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf
new file mode 100644
index 00000000..7183a4be
--- /dev/null
+++ b/setup/data/osx/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!--
+  Adjusted FontConfig for GtkRadiant.app. Include only paths which Mac users
+  will more than likely have.
+-->
+
+<!--
+  Font directory list
+-->
+	<dir>/usr/X11/lib/X11/fonts</dir>
+	<dir>/Library/Fonts</dir>
+	<dir>/System/Library/Fonts</dir>
+	<dir prefix="xdg">fonts</dir>
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!-- Font cache directory list -->
+	<cachedir prefix="xdg">fontconfig</cachedir>
+
+	<config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+		<blank>
+			<int>0x0020</int>	<!-- SPACE -->
+			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
+			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
+			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
+			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
+			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
+			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
+			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
+			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
+			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
+			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
+			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
+			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
+			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
+			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
+			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
+			<int>0x2000</int>	<!-- EN QUAD -->
+			<int>0x2001</int>	<!-- EM QUAD -->
+			<int>0x2002</int>	<!-- EN SPACE -->
+			<int>0x2003</int>	<!-- EM SPACE -->
+			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
+			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
+			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
+			<int>0x2007</int>	<!-- FIGURE SPACE -->
+			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
+			<int>0x2009</int>	<!-- THIN SPACE -->
+			<int>0x200A</int>	<!-- HAIR SPACE -->
+			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
+			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
+			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
+			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
+			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
+			<int>0x2028</int>	<!-- LINE SEPARATOR -->
+			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
+			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
+			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
+			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
+			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
+			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
+			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
+			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
+			<int>0x2060</int>	<!-- WORD JOINER -->
+			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
+			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
+			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
+			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
+			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
+			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
+			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
+			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
+			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
+			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
+			<int>0x3164</int>	<!-- HANGUL FILLER -->
+			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
+			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
+			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
+			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
+			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
+		</blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+		<rescan>
+			<int>30</int>
+		</rescan>
+	</config>
+
+</fontconfig>
+
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc b/setup/data/osx/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc
new file mode 100644
index 00000000..e69de29b
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/etc/pango/pangorc b/setup/data/osx/NetRadiant.app/Contents/Resources/etc/pango/pangorc
new file mode 100644
index 00000000..f56d3437
--- /dev/null
+++ b/setup/data/osx/NetRadiant.app/Contents/Resources/etc/pango/pangorc
@@ -0,0 +1 @@
+[Pango]
\ No newline at end of file
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/lib/.turd b/setup/data/osx/NetRadiant.app/Contents/Resources/lib/.turd
new file mode 100644
index 00000000..e69de29b
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/radiant.icns b/setup/data/osx/NetRadiant.app/Contents/Resources/radiant.icns
new file mode 100644
index 0000000000000000000000000000000000000000..339e718df85aa54359966eb5850b6e56e70962f2
GIT binary patch
literal 34748
zcmc~y&MRhMXy22WT&&E%z~I4rfd7O2hx$MD{~*x*kNgk$A95885NJS1J~O%4f`NgN
z<3AYu{qyG^m;omKHO5AS|7e7X{QjBJ-`xDH`Zrke@6Xu&{!JU#{9XO~&#(Xg|2L-e
z_pfQ_xOcVT&+mXW|Nl33Y`VL=W7Ddif7bj2X=z+__3rYIp^bkVWBXP&{{R2yXIRIJ
z3pGDuQ#P&sxdvq9?~Y}?%a?DuyX@y*5cmJ@js>BsS2uLl`~h?S|88Fz*4P-<0ptJu
z`Rm{R|G(jUs46smW5+UxgCWxY|1>~sgL41>Ujw!+v)I^(fq}`ZnSuGy|NkG_8Q4#L
z-P*tW)U*H144n2qPV{DFM#&_+Z(`v2etTA4qJ^Bcu+p`+uNxR_pZBFEt49}jiY0zI
zIpaSA!_z!9f1^S@+gZP#UW>oQz;IPpG(bVD_5GvI+fz;NGB7;da5P_3F!A8g4s(M^
z{~H*%|NpDkj*-{#@U^-AzlnkKOSR`FbGeB4(C^I*oIf+Yz8pOEwK(ucGXv-U9eY19
zFuX4f{L#t4{H_d4eaLeC+R4EDzqR967X#zx|BVdI3=RJoF10hT|9{iewCet+=OCT`
z7g#cc6_qdg-o(K3e{V1=1A~OLjM3fiUm6%}Z|X9zDEb*NFhqZRcI+nu!v$Fe-b8r@
zvswTD?`?U<z;IDnQpiuR{q6rJRif%o7#N<e->v5DzWnAy69(l8U=O^riV^isWMIy{
z0rJ2T(~cHt6<?`-P|&@xEc}1?@C%(z5a<7n9sd~^Zs>LX?_^-Uq1OeXZmQM(>tta5
zUNPZ+7X#z}A0Q7j{s%e#eS=-%(Z^tY{})&=Ffj85y#hIZUob19eyojk_U)H1LC)7^
zV6>m?Bayh~|FORR3=HQCocMXwjJr<${<%Ns1_Q&Rj$97zumk@eJt<YKe9ge{<?1y>
z0WIGheTHh4M?ua{d#x>%DIh4%=<?xy69eaSWt}~hg)@Y$K;i!?BId_~N3Ue9em664
ze!q9`83V&zMXTSP49s^GEJ4(5b*oRE49p)^u73jx|BsCf#TL2Qpd7^j1}YwIf?x)i
z5H5K7|NrT9ZZL;|CGa#P6()oEDyt#9|NnE`D;O9UDq-CJJ{f-u85k;{{IkABoBn4q
zFw}tgUyF5%Uj6@{&A{M(VBi1$|9`GJ|NsC0`&JAL46M;$761SLpQ!-0ApypB1#=ma
z{{NrS+Op{Xe@_Tsan)i`28LufA0nFh|GyW61tD|({||z&Af(5qm*x-_l+;rLF+839
zl)>S^{(ymj{{sVq{T~K~|Nj}7|Nm!T|Noys{{R01`~Uwdpt#2V|DQkh|9}6n|Ns1t
z{r~xY?En7<W9I+=KQRCQe}MV_{{|=xVjp1sA%B4JgZu#o2l)dG3|Mgk0|Ofa!vNc#
znVe(6z`z16VPP@w_wQeDxdY>)(!aI8X={J`2`hO~CI7Ga@h!HwxjCHSTNoBI{{8%B
zbf>?$xj7<WLBO|0G`;^DzZrG(_k-k{PoF-$;47*Lf4*y{^n*ZibMx|Nr=LI51{cjx
zL;n8w77LQ>@85Lw>eY{bKVChr{rCT$@6ZBv4aj1U{HBjrKYaMux9P*x588kKhiPj=
zJkn?clI-u_^x;FpkB<I3n?79K`0eliu<C%HU<;t~cb_l)9($+%?#8QE8@`48{~uPm
z?Au?E0+9TskNtO_HKl-Euu5C|&;S4bzK5L#(f|K98r}Q&0VKZ`<i1s*V9$g6djTpR
zdiBHA3;lPWt=;(HLp?Zn|7dHc^l!R~kY5ebf8pxtZ{ODZ2M2V2|J{#J`QP6fw7<pl
z-+gxB`Li1B?|;AneRtE<s|{Zvq15=j@z1wAcb{E2fBN*ZQgA?Tx_Wh$wl*|?{{R2~
zSNqQ0XKQ-@JbQL}IVd!qUkLpMs>VS617Waybx-e_<<FMi{kW-r`2vXFL2@7rl0O}2
z*xS4D<HxHX`udkI&;|*^F+`rB?dsL5S66*c!6C2x?fdud+TXrnk^i>o<As2qfB*dX
z^XK0WO!<G>-&fUtgZc-H`Tzg@)cy_$jsO3#$^ZWkNemztW0wcXKrnUW5%xh$MUdZ<
zH+@<LO`Hf(1ncLwhE>`>5PS^QZ*6Ui42G%*VR>c_sD;7a*u}u`zu_(8oBz`o*nj+g
z^ZNDY|Nkd5aR2=EWMOGp(V~B!|9<ah;Q#;q^Nxb#tn7@=PK()}{{Qc05Ipn!@433<
zjLe+e0$(0MUXK?)x)_AM|G7UoB`q^6Cp|sOLr7Fm?9$H;2GQ@o-mJ_@$;`}6F&7pR
z5R~F%6}<ePq2YfsgVe8|2g{N(GP5$>MHo0ZB?DcU*|;wLWca)9%l{?@sjnB~(=)TO
z6O<UZ^4Ddh7nm|J$lv?H@Hc1G-zEm>uP2kUauYH_xy^QND$5O5X5h%U_4gmc-x|F)
z{~H;kzn)4@vk^-S69{fkk2hjva6R(xKLf*;pOe@RL8RRznfQ{!gv>G=_!u--{Q7f-
z;osNaCv!#igQWi~XJBR$O9>NEkz)|5fA#l21H+F$clxqT8TWvs|IcOMR^mtu6XRjj
zzWV<^1H<Q^&lYE=2Z}Q6220;b+xx03B}|N8Kq~6g|Nq}V?<z`<)?#3ae)hkSq4B@S
z@6RP6Vmv$&yizp}&ex};TXQm4?QZzr%E0sHRY{1bOn|qr2)B7oLkg>e=(KNt{<kv-
zzkgNg&zn-0;Vdhx9VF$JDdY0ze<y>``&XrYT<!Z)<CQpgnV14IWnF%Bfff64HU7_J
zXJBTs-qD{d>+<7&CrG%$m#g{j^PM|(?EUh8auP(C_5B+!UWT5g{~W)+{GS08Wc&Ab
zgLx6C!N~>{>tbN}|Nr~{|1AtKksbzy|7~#IGziP}$A2ix?kkuzD_Pd`-E)vwhctuH
zM=<M(zthpb|EDpq{{Qpu_y7Ad85sZnZ(~4CjQ{_?f+fcP|1U--RF^FJ^YhmSP-6W5
zs*#@|xFB=F&bDJee*NzTx$Dm|wFU;xu%i6@teotLpFVbhYW8EUO$?lY*%{fz>A?lh
z-gYps{Qq|^i>;Y~my4HI$XJ*`{q7Hj|9^isGcf=EG*P^jfsuu^nSt%xe}=yge*SM_
zVEn(liGhucoq;odx=IrRyTsjp48K-g_zsep*Tldo6&bj?La>p6izW5u|9=cWw$^|B
z-pIiCe|{4Kvt(hhS`!1e(;-l*`~P!k>fJA3sRjlXPA17>+eQXnwPnBl|7ZC3|HnLe
zk2_%5c?}F=_8j8Hb_@*sH7`Nw>i@s}_6!V62mUuQi2k3=z#_}YAX#kAWP9z;e^C47
zYCKaT1LMyBjSRy7Zzu15Rm&t%<Qh;m=fR)f|6er=HZd@TgHl}6f8i%w;>A|-iP=S)
zUo2H)U|?rpFy9GEaNPfHbBh;SGbk73=SDU#u(5|)O#1Twe>(&B|Jz(L`R$?%M(HJf
z4Gb*IF;o73>tqo6f167#Yi}z91Fx(w10x4x#H2r64D4Xht>4WX8Q3khIWR;_`cvNt
zaub(K&h|gAcW&FZ=ktFTs4(0Adz=h%n}4?aXZ3^${rj`tEc@yIW(KzZ5HaM`1`&a!
zHV6-to{(9Qy}#~*#5@?Hy1s$am=}Xk=1(x|lE3ZY|KQa2|L-rP)Yc3t_5T0Acl-8p
zaH;qI|D_mV0fF%Upa1{w2c@c4P5g}vY*vlBlRttAJ(mCf|148$XJE2;{vVORSXfz^
z8Q3Km&iscZuto+RcJugz<S6avynq{!q7Ib8BpMlnnABr(OUokVb&GRKp1o!Gzw<LJ
zp$W5k6qIh<V9Cf}S&&xy<_*LDghgOEP^#c!W)#gmRmRI8=9`(f>ecUm4F3ycUxCY-
z`3$VavD^#{TB;0OcIi1&9{l+ZN*Y}Zd;d2wu>GGe9a$X9-pC-JpP1cz@z2*YpcFUT
zTMm?Hq`w|b&(Bt2Vq_4HEGpmn<@;v_25^cq&AsxykwN<NnZ$znNG=8j%e<@?zrQdr
z{QrA3o`FFoD)aW2Mh4y=?^oRZvWA0!K|_Yc`*_2Du2(IB3<7SMd5b>&YGjc9|Lf29
z-w*j17>ojW890mXEK_4((9O!}yZ!&i|5gU}f4BJ<7z``C8W^~EK}}<R&m+ISfl9jn
zAc=^^JZlaH2I(+W1_u2fkc7v_z)*WAy(m5~B%?%wfx#G5(t#D1|L@Pp$;<7(;Rq51
zm304ab1^fN|Nna9`t@7Ce!D`2IlkXB4l|wb_uH3-5A0t+9SLJlxybhB&&|FqpMHW;
zpBGqZ7X!<OpTGb70+n?Tksbzy=b*9<!ULr=F9rq^NLlB_z@YmDT-LcWFettQvHnEc
zd)tFqzn?Fd_UIQl_5J+!=lg$XS(gLun6YqxIwx?<CMzo|%?RhBGXhS$e*OAYBR{%0
zgs-;=TD?D*uLKc6CPn)`Ald@Y^O=$57#LX7ZXskr{Wet;dB?*jvj6{o*Fln3UJPk5
zBdPhO#o%?&7ox`G8IlB)`AwT)_WwIVU<J8QF=XnGCc`{Xjsq#kLY9EAf6riNnEe0$
zdll^RN8K41BoF=n|K9_f{OxR32KM}WAd}oM<=^*;F);X?0?GdW50=k?up#7g0|o}Y
z_23Qw%>3a0|Nno5$o~KTeY;!Fdl=`BG01$@v@JP~UtnTL^w|J-RLi_W5{ED!mq9z`
zATt!;W<n(Y|9>bC5{F?-`4ccHFpVjHiU}+MB_Q&b!7+93HOLNBdBx8lu{L=R4-a>V
zjUYCvJm2yE|NnmvhnTh%Q=UPn<>pRnh%^H>c?JfAZ?VfmH8U{a(2pj688v4iWTE=6
zBkV(#1F?65+<ynRd^1RXIa&?^X@p|ts8d&Saa#`>3*m$+WnjoG0X4*p3PA$@8U8b@
zXPEH+1;dp8PZ*~Cf6OrB{{x2B|4c7-uIgCBx_aZc|Ns9r|G&x5`k&>;mZIeJjx^TP
z+_(S#|7-n!m4WI1zkf~t+5VksNlwqq?Z{!uE`Hzn|1tw3NDuS9$*E}#nG8_z?*Hc*
zTK_Y@U!0ZF1Q%@j&v@Zb^M9s)|Noz6VEX_6U(<h<--k+5GMeE^8ve6Bua*__xYqjr
z1Vh_@<||F9>8)T{-t6M{|9>q|7Znu~l`a3&`u`}%g4Z)MQ`^DvY}uthj+lvxHi|Ke
zifT`7{eKATi&cdw8698+EV=0(5~8gjX@||t{~7-62U)PcHYL3aEYDQnE!ru@EGiy<
zr}_V02F8E?n*TH3>P=1S0ZTI$`1FV|iz>JNZ2Z3)Wc7=MxhZ`xsa`QAQL$@{|98Ut
z^=oHIaz;N)x=)Nz;#%YX?I0V^btI=xM3dMCGVsy#wA9HkiFPpt@n(pwEg;EHoAXnq
z!X#V8Sj0tn1;ra73O0d!`sa9gO2(8-rtG}JjsnIK{}wTBaej6Vb}nIYF)@(k8$g!d
zXiZC>n#q)xXxt^oBrYi4AjTvv#M#Ks#=*`DQP#oG_<sS&#`p8GQm1CJ=4Lw!a&UCA
zbAXK!;b!M(W@q7G7m&Qx_`i*z_5U0Orhnj={I$LW<N)UE+#vaWb`}m!es+!yc19kk
zI);Csis@g=f97)yDd|%(S+nxuG&wo?*jYFvf}J@!*%^7RHvVsAX#YP0mZBzRrcKRc
z$xS!o<>+H)<>0kRFLdi-XXFN}Yy8jn;#JfCX$&p@ncpnWOPQL<oRi}t($CJ$!KoLQ
zmzC=ZSIY3O;XhNE>F>t>QyH57v;5gxmYgvqlO;PpT$XbJJG)X)UUp_Cy80@SwN3x0
zFf{#VzTA_XJ~fjiKVF*$>|7C-+?>WtMl=n~)gs#O8vjpWX#CH#GBp+C@N63ajt+JP
z{ssj$MHM+=<K(<%EZRgx+nfGRW@!A+*pxOUlQ}!rOS+4l%m3`}-~WFdtWVF&YRP2G
zbw}|GOSPz|!p(;NjQ{>m0%>ebo1Dp%9j)HQ&Zxe+@juJ0Nona>t(i<&g;rhcjGQ+>
z;R*@_mTFNk(S#->P5G8w9qde!E$<utGrwMxk<y;YoSSOJ-3b!=4b#S2Eh;7^b*Sn8
zM3`kP`PLFb94+ij{Bd_0{<HkpUy_p1mdTQn<1WO}!Op}N^so`+xK;*`t!x#dVq&89
zzZ((ydGf8r#l%3#lbzH4P~(5*%k?SgZJ;O#k_IIO(^E|#{cRxomWVcpF^WzC`S#xg
zkU(o%cP3L-ZdOw!7uXnaQ63J}rH%iYAN6OXwPmtq<;Q4pgPftf>|e|Oc813P3}+g}
zm_)TdH~xnj(3Q!On`!Q!)0oMWZ!O*=#wh=);Xm`cMfoZ1nJjrJ7JMM>;!SUwz=ajK
z+5P|ji6${d(E^Y={`W)N(UHlPljkbN;gJh5s8NhVRPodQ|GO)aA;IAx3NnZ<`daIM
zP=Dj!|NqCE#TaGpHNs42%jC$)4^-e_XZM7g!6vHo?Lud2S{o=agerHjGurHdl$xNP
z=)eE}&ozrNitdM-(E{>vq8=AV13M$klqNA|`6-#HpwP%m)aL?aMCI<b|2+&%|Cyeu
zi8qNc9E9s{&Sc3;w-e%MLe|bC9-q|)3MFfBSO{l+YW?5C(DI+@NjR$RMo_f-NOH8G
z>Q2sT$z;yXa~JDmXX5g`-3*G(UQn^}u)tWn5pF$4Yg%SzR$i16M;p5Src9Qs{AeZ4
zPIgA~T_C5o{%8Ghpdm9&8lj!NH7zqQ#hja?jhzV|3r%87;>lSJpioKH=LJQ8^0c3j
znCxL-_}BWM{c1}}T4sT}cmv!WtgV^ZE&?3w?93b-zR;Lx65|w4&dSWp&9D~+nIfA1
zvh_d654_JOWu#?h=A|2O3yX_E1CpuBN2-gRnMc$Qo~qczle4mO{G>pdIlZq!G&6r$
zQjpq^$&uqA#LmIa1J~}#$<fKqA|x&jOH55-tl}y8(W;;TFjxu+0G8jos!}o<K$)GZ
znVsPPBn}zWyV+U9#E^8dh{s#<fUK47_ydZ!w*Sl*I+N3yG8uD%S`hlQy4hJo#gSah
zBm^q4nE2A4Lmm5gR$6LHCSy)8nl3S3PG6`$8^xH!L7~j(a~7)U)2f`5woJyHP-IQL
zNHGM_(#FncvI^?2e|yS7B?wb?z6-LZK18B`=xJeRl5Y79@)F~Ja9z@t1}ZnQ^5S(l
zku|onGYB-JYi?#|6xjxHBc#RhVrE8adnQY6h9xgYD<V)dTiIDOW?u;6ZA8}3BhJgg
z&d$NkEh;YG^r_`P!@o{Yt^0XhF(|7u=j6JIcCa%*GbMv=Gdq)b(ffw~j0a7Ta%H0!
zFW4APP@OC)sy)B;Kf}LPSd-z;k@_T%XR`AH<vBXp8IC|=m+@R+13MG9@4c4)EKB6r
z-Jz+oQH({LmxDu~MT}Wg%yBO$gZ*m)8`b=u`DRZFv?SC4mxOwAe}N2Z{?EM9%6von
zf95w$ky)@Zi$$EDM_jy3j9FAF{zdD5Mg~weeGLtqR7n1ptp3&fzaLaFPx#ODt1ttm
zmsy;bogdU{QfvJR3Y6ymEI(Ekf})ZoC)*30ZFpmzxBQ>T!0@l@Kf}MK|4i@l;kwyC
zp}`>}-VSP%nXl~p&%7U84=`uvhf8;{Gdi7W{Xd1F9XzCotPhmn8rYe*L?AkSPPhJN
zzS5tX)()zrH9$UQ)L8*3GN&=L{%>MvM6njCor9eR<Z`LXXN~`vpD)Nr?aXAd;s@uN
zrjL;FVks7#jqFSUcH&)P?4rtZe}CVcm(rQZk{iIw4l08LV(z#8Uyi1U6XZ*F9;3t}
zn{F{yQBl*<w2ZDywp>4PQEqmQCUz!Ho0F~oSEA|S7U$*QR1M9~&dib)?-pYciOlW>
zX%Z6yH`o}JH?;j<g{Fs9oL|B#FQ*}sG1s$Kj4>t~)O5&g%4E#-YZ7DOXBY4J*!q7B
zk|rDRCNU<7l)UClraTq#ZjhFyOqQHndmC^I#}8DLitlOtzYa-{nK-D4tui^SIg>d%
zSw_4Iq^lv5EjuqzkwXlkuUU*y{6ZtR@?4M5nyVn*D8?eH{J1>5Ig>fhTSB~3j5{Vf
zGb=AnkCTI45>%jMCxEJB@pDc8H)3dX|F<QzC6gsL#av9hU5qUzJ2%~$7gXzkb!MeO
zbT<5F__qm7FRN(a|KClipqer-LR(C{Rg5`4-(94coe`on6{5BAKe|R1(SZN|FSTbf
z=j8b*w1_c_yUT-WIs&>FMFSfCGfquu&1BBXOVVm#XX51IXeDSFSR2#B{EX&I=G-(Z
z-U;lCpzvhM!s$Fl(SXMPjH{CyL5*KG;fd@_{I;NcO+W|xyNdM8to$IkN$kvam)0aV
zX5zP_=|AhC)VySE?uqQI+N=NnUq*xu<{u5lf)m-9q?<oB{AVPrqxnDM1GNe4Oak$D
znut-~@}KE*rf?4^_Z({>Mnl_w#yc(DwG3O@h*3S~Kd9-7$K8dBpzfDwzyhqMalOmW
z$jr>i@)8sl2Q^<o(Zs+o^*;kcBUbhN@A5OU^CILx9X3&MF;KKNGEDs6fI~U!yMnwV
zO|C|ER&c*9pz;3<94cAfWt#GHw6ZgC@cH0Y#rVRglbw+>3zrJU|Nk2PGrevUY-49K
z-1ZNbvX=i$mt(n_*qIb2d~3$)q|FSi|Jk<Ku(JzgJ!!?NVhcmtf2LWL=i2_y#NwrG
zpem^6|7<K$J3vw$|L0<n0`<y4-Fb$8^RdY8W@!Gu5R3TJ;UIRg@jr?`n#C9vqX~h!
zHFa3T8p#l2&P@{s=L@K2u4T!f_I;!>7bG7*h545yXXYjAbAtvIK*=2{%(^T++ggAF
znyf{kqD+hJCE7p@b3T|WPsw(&GuoU3xv%Lz)9ZS{R(3{}sm=eNf;uP{BDovcnMBII
zwETa@(E6WsqZJ2t#O>DqFBm{WPR;)r4;+Uy4PG;JgL)<J89M)eVrcvS4KyM1@85sW
zAlW<y5Q%N5jPcUq&ULJ7HzSRdeXQV@%I(NtP0xRaI#Tv$o)!axVsS?vQ*J3@q>S;9
zeIo-SOc*jy#`GYHtqCF6^q=v?eTXAr17%F#CknS9R5bi&{k*e0cjha|I2q%5wKj+(
zZ*J-P|9{UlX5{2$mT&tB875=A<<$X^X3H)6@~Af}r!kK?C#(55WR#5QV;Wy4NWL?V
zxoBEpR%;$}cJ`DTurV^mPK9oeY*!v*R&GZgb7uaEckmH1#@&{^AjuhdEV&uA`+q|Q
z$C$20aQ1<OXXP<v=e<IVi!ptz7oGr>$Sr;a84_b$sy_)?3^W?Xc+zzWNNjQ*Q+`Qd
zV;&P&HE1Y|>1ip~RFKr9Jg$;#+u+i|ygaZZXc&y?_e}BW42+5uokfhrg-v-pg(beC
z3=9TICHY`Apg}Ok?OHP#7`VD*I8;JP3iI+yqtu%jSR8W;LGFPKe=$7>VqL|+qMuxv
zX4b~QED>1t26eoP>1(dgItE4q_D%*yg$EEh_!t-C5|#Z743|LzDDANEEXG6j2N@Wy
zfW#XAGk*CB8M|V-oydI%Dh#S|n6~x(gN#!#{cIOIf-JK$?J8tMigB&UF(e7*U8!x~
zAR|u<$txHdB$=cYMW&-D$jCeZ8DnBlUdF)gbLRK&|34=xBdcNAm622R7Cg8C8d74=
zSi-=lxT^6#<1V|I3=G#nt_C@eWmiUC#wy4N5`zXP8ninYm;{^NHT-A189o!lL<}44
z%E-$teh3*h0x4$JsEU$qWnhfH)9|0^W0%lO21b9BfubE5d3l*r|3L<dKss2}OAGV8
z1sfR{tq(T-XI!T+lY!9?X>901c0(Rx)^U)t!DB-pJ)G*Ld3hz777X%B8viq%w3^Al
zB)b$g5cIS$k0~28gbNx70;y(HFKx(U&Mz$b(D0w>ekAt{1}44+)N!B3O?ix&n?ZJf
zM{S_G8uQq4>VEzI*CH{KfiWCBz{3h!?DHfalvpd?gZf*I|KW;Ra_avtGn~o5Xt5iT
zvAY?-%5P^i<uT?!2ZZ3NnR3hhXEHF#c7nRcP5+q=I+Qf#G3MS!GnBC~eg*>*dpdM%
zhWRjeT7Cl-bxef`tkW16y^w}sjxp$#;!-+=fzfCu$mZ7nT%UTB7#Ko9Sq$BBkfD<p
zm}I7)jIA(k)M{j4l`SvK!*DG~!vqE<?%WrkK6vYY#w&I$3@iqTrFn3pdl;B3)5V(^
z7}ZM~^FZqR85ljTK$J7Rj^=G+U}m+<djt&zwQdIHh|&@%B=x-vjM_^ePG|bwDAUEj
zC~^*}TBVDDg*!LD7@<6owVQ!Sxb+WcIHB!7<8s4Z28O**)v8?#EL_>88KO|b84Clu
z85mQc<06cwz4{s8y?xa#24?PDTh11UyBSLyIvE%}&p@61ER|~llG<(t29Y+HLdSLn
zM*S5~_x^5^n1rNoDqK-3C|e;0Js6khOu?$InSqJJ=mf}G@Bjzn70+o1bt<h4%u2H^
z_;<pMZDL?G$}Fzl`xDf02aRShJ<k!E&cLt_8Uz~63`~6apqzccpdGHOfq_Fcz9c^{
zC#(4!^6&-I&&dii8Q_B!XZ;!(7`^Vc{AXMYTK58qPqq>V2FZZJ!lpdt?A$4LQAR8n
zcbLp%VA7le8>U!pYP_!fKhv8kR%rOM6#G~fm$c<EXBMyc0v)7ayzM=cfk~heF*L#W
zk_)PywZuWxJHN0ER4vu-{{`}5^M9s~>HISp7$Z;yBpC0)^stvWGBC(R6&JSUG3R9T
zUF`hN*a<3e?2v{b5ULqV92*&!w9-o2^O&=;=RRru&$!-dCIh3|GDrr8jXa>}XkuVu
zwa5omqNO`NH~we57&eoENw@)NxB*3Z3j<?(VMiW&Zf5Q2|F28Ax*3>6oj5ue7$fer
zg2x%qRjU?u<uT{vbSU>SFpHICn6xr5TAY9kE+8v)Xk}mwF7C=>%1`F(WndL6%rA*i
zYh+-QT?ZLdKvG-m*~-8qk(b|@$CRJW-OIowR+yJpSm-Ox+XWp=fGAcgZOmgVOlf0a
zbSj0ZWfTL|+{O79AR`D6g*u?Dozvvq#=sa@+5t6{QLL~jkFoFtV$1-d*rOQKQfYj^
z*~-8y7GILz2360*kyr?_?<r)Q0HW9vq&Rcd|DtvVX6=lU{1&j{J_g1Zh+5dl075lO
z=EDEq<l7mTIj!@Gn?cIC`WP5vA<7}60mzCM{QtkQlYvRhzpyEvsW5{Zw_3)`1r7fh
zY`Yj31e*jH1^N4NnhH^QbO}BMjsF>vW-~B|wcuC8c#m%e1C!O|1ib2+{xkGUV_;ET
z_5Xhi0fmg8<R>#Q2{(Rh_|Je}ZS#M|%PJEY7-Q}<5mMUnpXp0FdoKf{#nBc*YC(PW
zrtWHn&25BK&H?w=ak<hPlsGdNEWl+7yG&w9eqLVYf=1BrC#0K>)vQ(qR=uneutHe>
z9ILuE1{NN>{M-eQo-!6Cci1`@m?S-B<5cieu8V=847)VAJI?s7zMX+dXX|h5YFhp?
zUW#gFV3O>EcEwR00q%%zwqRgj%Xkdwh@;AbyWum+&O*B3sB%c1a8wDTE;y<LY6l!u
z4%Yof6@3btwnIsCgIwfABe<iD@I}sfbdikR7$SQ~6iF;@%wx<z(#5Wo1WLIGp*99q
z{j8FFgg`q33!i;{4opu(Cj*m|>mG=`jN8OI85phagLqB<8DH17F)+$ahIFJEFN8KR
zFmV;b`qAr685ly5`_cQ4K`J`(`q5YFx{_G3-oqE1Fnz2L>S18MkJ5!^`ZG_vmw}P}
z0eqba;~|HBkN~XT9L+fa#BKV|c>VyyIY>Qb(Mce=hX1V3%D5REuEP4t>Qfk4*&qD>
zHAkwEfr+Q+BczkebjzD<Dg!gei^JNj42*IUVSVFtff)=87M%=?<{O%!t40_*6<0Da
zM&3s11zW9QU=nG7t_@+j8p*w$f#E80zqdhjBUl8q283~`!DcWA($jU@3g$pNx4i2Z
z7}bTF!9tKO?JS9P46Kp?rJ2SYjbLF&FIIax12YSkzGsI!lZU-<69WgoZEjI+UP+=#
z16UPOSC(@I1G7SONpWWpXGxAR2Lpp{MsZ$aE^B_VuPCUSioB46>1&?w3<hRVx1z$H
zT(-ROIL+ANyw+Uiq8y+57~Nde=?p9^yq3Aey&%H^#gt1ra+z|<UW59J@SZQzAqUp!
z3@mIqDaCm`x$Jo*$?9w@GDRSjMXx|A8~-ythpy#dx}C&3gMnEhtSG-Xm!mk_golNJ
zK^93Zs29pqs104r!Su6T9OMK+_uRtXT$ZAIXAu@qI|f}tDZ?sQ-`NzTp2s4sxGk3<
zrzwjir?4bUzJ-Ai-4f<92D!J;Zgt8`24?k`lDxKD#*C7N7Pi*jns9wi7VNqhnxK7c
zmFW!3(mq9nZMoc8Sqq;1`S<_#WHlC+HU>s%H21NTF)#>R2X`^Sy>HE_49vU^`9*EH
z%-I?3SHRuyP6j3xb&$TSd~ooB0)nBefq@|s+8x)N!ob49<&ag>lFO2lUbFv4!+)lm
z5v-jI%<Ssvd2JxU>I45k;SJNu$aVnQJJ+1Tz{bMBz~@z1*qF<lQL^$KxQi~*#lS2R
zS)A9F%bZ!X=mXNC4u;}J21YaJnhpldDGUrOjSTG4VI}!lxziqi`s#|E3@j|d-g$*>
zxy)JF6Q00VbTBMzVqoY4c^1-V2WxI-VAf7*z0~-h>7+GF2PjclXB4;PvSg>XT!MAp
zPc<<x%6)<?;$YD1VPIm_7Hwi+07Zk?TTu5sim!u#m4!n)z9g>|<lV}B-yrjN&=nlV
zni&|fK^8+g@|s-?EG%-NrBV<>SOq`+|JNc3@^V;7ep@bcM$z)u@P!*kn;96n?n1jp
znjH*mEF!LXMTJnk%)-Bx8Feu*3po~o{hK-Y9;7saE!k*6bS*X87&utCOf!q~a$(vT
zdA&fP#bumT436@aBcMJZXc$nX8PSE)Y++z!VO5PR$!o}EglL_}z{0AY2+E%<IT_^}
zeuBEPE&mx`M4@V9mhdkwY=UX(XJBEG2`L15F*A4mJ5Waqysm-iVTo}Ql68#?EG&GE
z`9&=-jlCcN=Uh;-%*vQ>7v#p)|E!;S)FQKm8sQq*H9;EywLuw-u^1da-3+WOoW{vu
zXJ)6hocIHY707A~woTd$3=w6n2m{zO85rbaK&qMZiW9{^vD3xC!m1Kpk`Ia2O<zEr
z+}8iRSL|6B7+4|-vq5DVbn=}=Rm3m9uq~G<KTW%Zfq|uyfmy<*7!)g+x$|B@G%~%8
z;csGK4=c<oP0)h%`I*vFiraIU@{;&k85mgFKz_B)1N$|r=OV<fOy8U2ni)8FQ}S|i
z^Naj1K#~JvUv@_>V}4{C0|QGd0}H!GD#-0DIT<wv|A8U|G`3*W%D^a`*Obec{{X6~
zD+{D4s)2!l1?0mP24<nCVo;o96s?E)kMXp3I|GAIb1q{Jbclozq>D8_l0iLA9HNU+
zr3{oiv*tgAdhJ;nPX_~oAcm&Alz_q#aCEdVFe(+d<T7Wc_g#ki>vx+ZsC<#jZ$h!F
zEtfqfH#e^kkx-S2n{rw53+wj(2KfxU2!nBnE-3Nxm}Y_ehvd?hT$ZftvWy&fY6V-|
zkjs)+6ytdu<XrGL1=AHT)=mZ%HjU)sJY-jQW;Nw<XQ#KHd9kP{GZ*dzZl&Vf+~Ra2
z1_qwmkDz`%WauJSxQl^VF03fO70CxZsSUX-IT=-3el+}Nz2Bdm1<5rn46I7UMS1qz
zO$?0kv(ZK|z~z>R8z_}CWoA8u#1{Lrh1nSydGp`5{Aa${kOK`yX5|VW@iqoV%Uz&6
z1Ydr^xWg0_AiSoK5-g+p>>rRR&HtG%Pwv0o{-5dVW<hA=NosX6FtJ8HhmL44-S%PY
zWMJV?PlS|U88y59z}H<cKH`SxVp0y4?qXn)Y=ADgVEULL*u}ss6%I~5nMEtUATPLJ
zyvqa8#-dbS<jUX0z^J<vG_nEqr=S<Oe9p|8@dUBd0<MEisW`VN%aWywfzjn8XneyO
z<S!npbZ{w^-gOC5#vw*Jpf<6CqA0I8LA#5AiLK;m<A0`$VJsl6nh6kprPuBK2`K|W
zD=gslF)9@|<}wv#b9OVZip>1;wv@Mrfmt=NIIjg%C#`tj3LW!+S_4s@S7h7Ez^EZN
zfq}^&v$!#rIV)$%6WEXkR3)==ac*v79%H`nA_jI|+x(*JjMnS0p$@1TM(Kj)JjNpL
zB@8SQ-qlBbLRLz^-NwY3p5L6uSgbgefl*1dn}Ok2D|lH1LV?Ki?B+bCf;7>I3@j`n
z&Lx4}3=C(H2Q+xP7??$#RD)C%`|<QKu(9x%WEU6tb~7-XfsJE;)Y$*qk<pUJRFrPf
z!@$m_o?Mcb3sHm^z~Jd(VDbF_yFIfdk2$|MS`$=b%7z!^H{>!xl)?rtK<0V;|9_=D
zkGZheU%ZupS=b}Ds0oWQ29JjSj5E{Q^B9XWTSFPsid%3fVtQPX+m^?eo7Y;%kk^{a
zSP1q2l7$Q&jsF?fr?uow%w@`~_6K<nO_u3>O?G46L{RxK?R6Z6f~Nn>M>F#BCg!qb
zr*~fY|34Os3Z|bO=@USeeC@uU4gVQ1l{Eine$}3l-3v-OE8jI?Q_}LE>F0*>o^+<1
zsgGN*DQNr8^ltyI&fSbVZ?<8RhmJa+S`Nu=3?2*6bu=+BNn3C=F@VDdwi*E0<y?1p
z7#LUt+zLxlO&h_=;DZcER`B2DX5q5RD9X*vFOF0PD+A5`BOAnehetcEIIk&}rLf3H
z)D1d9fMf>q`~2*@wp^yX%!TNZ;K2o!Uwcb4a+-3Pvod;bH-RVW5$3o2=X$v^FC#ZM
zJH6rPZ^%SHOcp$@aC2%_YWaqb&~XK*wcrtjGuxg)M--r<$YTjmA>>g6s1Vxt0aO$|
zascInM+oT6zR(Ei_k-+RfW)puV%Lzu2DQ2b9IZH;7#N`XxMCR?SU8O{i;GiC8sVb+
zu?!6AamApPNO6P;T$m+7#J{kxIhUod*o&_mVlnfvs+^qGT;{C8o+}`crvEJ8c9*8-
zH0CmAXSSSx^!GVmEYHix&B-X+{tG&Deq(Y@?y@&XGw1goLkfJnJ^m8##xn=J`%@T3
z0ge#Rt7t(3E;v-uLRfv>FVNm26#Q=)?wv~1bpv<98x)&ioLcHygUhs}t1t`E=*I%M
zv`|spWe1wA2<|&!eH$Ay_+CCLS_(HxVG49_C&E?)>)T#XsyN_FGZ*j|JVMxpo3%y{
z?p~@gyg_FO;kFhb^R-HpsuqI{(_4hFfFSEp3@ca@)d;cHZv-txQE<YUYIZX)ux30&
zF`O9AuSL?-a)B9WS1B=eqN;h3MimDrF8_&YF44SyC?`^p=NOKP7ew2Kq3{C5RYEke
zc@D#FkiZYf318&-oPmKsAH2mFWD<G!E6V0*Qk@~)i?Q39L}yT9KX>L`5^cj&PJ#Wd
zCoqj8S%hr+HD;4+7d8!K+AmZK-sX<YMAF2_vY*-iI%&4xR*ho6n39qh5m~_C0B-Y0
zl|izfyY2b+@6THi8{V-yMP>ns^&DO&A=$qaqHrxcc6%YBtObuD%BVyl?6-v-6%hro
z2`d=_J#K<Zw*UW+u)i2)<|W*X<ZPH4s?iAh3*crpVD&l!1A`TwrY&4IX$)-kzmUb@
zfVHHVO^j-6_Wxgs!+!D_Ie49c)&3tw*d1^LuTf-4VzvMOQS3)%(9Qn;kdsZ(LxBeN
zBicWR^#A|=|0j?GZ_pe-1N)D{M|V){|KEsaHJD3%`@cDY4F(bL@&}xbzG;HQ&@k2Q
ze-ntXAqur{nS+plv#4zUpSg-~qZt@9pvOgnz5oCJH!LSJQP=)mwn(-!FleFL{~t>k
zKu!BE#-jCqmC)=rKye+ILp}SSHzA#F3^tp)6*d0<)6o7O%g}p0Ou-n9Y1-L;)CBBf
zB*J7pG}R$dw6gzU8d}6NNKe9cRw-@l|JIB?@WWmVKFbQp=MW}M>|daZ6zX7R_*sZ`
z7$gns--mJ@HpqJG4H)*q1gLKRtvvKvU9k(#xCxc*|JaY-tmV#l4f88DnyU8yTZ4K`
z9s>h|53WIKsAH&U{}pdgWFup>HE6{h)K&yVJ^Np$b0J&Jz`!6l;UmH#94u<t|EUAL
zuw^c|gTqc_VQSf*kLGs<@BPTu;AB(F{!de7kX@j+5T}i(64bK)|NrL|@GiAjGtr%Q
zEcPEmbs_P*^U>fSU`;1#b^>B97W)x58$gthKyK7$VDKWP|8^P6z^ow3Q0tpZB-sD|
zL*EkU>E}f0`soJ_F*HI3exBw3zl&7Z<E{~978#1JhM?ID;|89Cn0CntB%+S(uuO;o
zO31gxydcxDVvg87hY#;dg2av((n+b5Scszc&jj=W3#&swf)X^ae?9E*O^^iyF!k*}
z7e~NK6lrSP|Dplj9Y(PS7l*p`|C}p@%OV`&RJDIQMz;Wmtq5T%+J8O-y>*DN1}BSZ
z_Wx}_Zyn;a6Ip_4_Wweuqmiw^%ch?F7|m0>_QE7b?MErO$>;nU4S!ggB847Jf8-}Q
z6rIB>{SoTgqIez5p|1Z|<DMw`g1rYqUHfNnw%}+O@78Vu`xl*{uKjZv7_?_$nIJzB
z$imQxZZ()sb^93@w6oEH9}5Em{p`n4j?vBkbg>`%FwQ(2c7uee>VGlp%Wr0ZEW&}Q
zYCjX!6@UL6aM%qJrmFo6iZ{U72bGwBa$y6=QY1`W`x(UQ(Faiv`{7+(N@e>Q7_?CC
z6uDc>hU8f+Osd<@z~FQg7XF{731hJmMTiFWGq6NI0J~r_wn<YI+o@ds!Oa#*&d<*W
z-+=-b!oi@0|8ZD_Re02Xa8f}d$gF>{hA@7?(eOtLdN6l1{PCw6>dE3rf8hI}sAmgq
zld#+WFA}#7>dIiZ|9=j3ZNY6C4*Rok>!7a8sQusq2b~xVf9fVPoTiPYKlG#r=F=_x
z^@6R#AaZd=7?maBF{}m&{G;36P|h<T`_S=Ld|gKBhJey#bj$z$-z7p_JMfw&-uf2R
z1rMS?14DTAP*+lW1=6~w&*cRBjMTLqWSS#vx#7QA$oF%Cr09cL!a*+hyU&w8)?u-Q
Q&D6pI%NkcKDo45y0KM_;_y7O^

literal 0
HcmV?d00001

diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd b/setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd
new file mode 100644
index 00000000..e69de29b
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd b/setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd
new file mode 100644
index 00000000..e69de29b
diff --git a/setup/data/osx/README.md b/setup/data/osx/README.md
new file mode 100644
index 00000000..8122c170
--- /dev/null
+++ b/setup/data/osx/README.md
@@ -0,0 +1,50 @@
+GtkRadiant for Apple OSX
+========================
+
+This directory provides packaging steps for GtkRadiant for OSX. This document describes compiling the application on OSX as well as generating distributable bundles using the framework provided in this directory.
+
+Dependencies & Compilation
+--------------------------
+
+Directions for OSX Mavericks 10.9 - your mileage may vary:
+
+- Install [MacPorts](http://macports.org).
+- Install [XQuartz](http://xquartz.macosforge.org/)
+
+- Install dependencies with MacPorts:
+
+```
+sudo port install dylibbundler pkgconfig gtkglext scons
+```
+
+- Get the GtkRadiant code and compile:
+
+```
+git clone https://github.com/TTimo/GtkRadiant.git
+cd GtkRadiant/
+scons
+```
+
+- Run the build:
+
+(from the GtkRadiant/ directory)
+```
+./install/radiant.bin
+```
+
+XQuartz note: on my configuration XQuartz doesn't automatically start for some reason. I have to open another terminal, and run the following command: `/Applications/Utilities/XQuartz.app/Contents/MacOS/X11.bin`, then start radiant. 
+    
+Building GtkRadiant.app
+-----------------------
+
+The `Makefile` in the 'apple/' directory will produce a distributable .app bundle for GtkRadiant using `dylibbundler`:
+
+```
+make
+make image
+```
+
+Getting help
+------------
+
+Get on irc: Quakenet #radiant, or ask on the mailing list, or post something on the issue tracker..

From bdd8d5af58834f7c4b61e190277d55a252951741 Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sat, 14 Feb 2015 09:38:13 -0500
Subject: [PATCH 03/11] Add gitignore for target directory.

---
 setup/data/osx/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 setup/data/osx/.gitignore

diff --git a/setup/data/osx/.gitignore b/setup/data/osx/.gitignore
new file mode 100644
index 00000000..e420ee4b
--- /dev/null
+++ b/setup/data/osx/.gitignore
@@ -0,0 +1 @@
+target/*

From 77c538c0c77c10faacdca54fac6492b03b7f79a8 Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sat, 14 Feb 2015 09:38:48 -0500
Subject: [PATCH 04/11] Eclipse .project files.

---
 .cproject | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 .project  | 27 +++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 .cproject
 create mode 100644 .project

diff --git a/.cproject b/.cproject
new file mode 100644
index 00000000..409a9c07
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.835953277">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.835953277" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration buildProperties="" description="" id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.835953277" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.835953277.2072262777" name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.llvm.clang.macosx.base.1440061656" name="LLVM with Clang (MacOSX)" superClass="cdt.managedbuild.toolchain.llvm.clang.macosx.base">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.MachO64" id="cdt.managedbuild.target.llvm.macosx.platform.base.220063451" isAbstract="true" name="Debug Platform" osList="macosx" superClass="cdt.managedbuild.target.llvm.macosx.platform.base"/>
+							<builder buildPath="${workspace_loc:/NetRadiant}/Default" id="cdt.managedbuild.target.llvm.builder.base.1826435543" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="CDT Internal Builder" superClass="cdt.managedbuild.target.llvm.builder.base"/>
+							<tool id="cdt.managedbuild.tool.llvm.assembler.base.1540137577" name="LLVM assembler" superClass="cdt.managedbuild.tool.llvm.assembler.base"/>
+							<tool id="cdt.managedbuild.tool.llvm.archiver.base.726448752" name="LLVM archiver" superClass="cdt.managedbuild.tool.llvm.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.llvm.c.compiler.base.423406515" name="LLVM Clang" superClass="cdt.managedbuild.tool.llvm.c.compiler.base">
+								<inputType id="cdt.managedbuild.tool.llvm.c.compiler.input.1702833029" superClass="cdt.managedbuild.tool.llvm.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.llvm.cpp.compiler.base.1130692273" name="LLVM Clang++" superClass="cdt.managedbuild.tool.llvm.cpp.compiler.base">
+								<inputType id="cdt.managedbuild.tool.llvm.cpp.compiler.input.1553525897" superClass="cdt.managedbuild.tool.llvm.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.llvm.c.linker.base.391098519" name="LLVM Clang C linker" superClass="cdt.managedbuild.tool.llvm.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.llvm.cpp.linker.base.2079349783" name="LLVM Clang C++ linker" superClass="cdt.managedbuild.tool.llvm.cpp.linker.base">
+								<inputType id="cdt.managedbuild.tool.llvm.c.linker.input.1496404439" superClass="cdt.managedbuild.tool.llvm.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="NetRadiant.null.969150560" name="NetRadiant"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+</cproject>
diff --git a/.project b/.project
new file mode 100644
index 00000000..daa477fe
--- /dev/null
+++ b/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>NetRadiant</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>

From 4c4bffc86cde0ad76048a274d0b31022c32dc013 Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sat, 14 Feb 2015 10:21:49 -0500
Subject: [PATCH 05/11] Move osx directory from setup/data/osx to setup/apple.

---
 setup/{data/osx => apple}/.gitignore          |   0
 setup/{data/osx => apple}/Makefile            |   2 +-
 .../NetRadiant.app/Contents/Info.plist        |   0
 .../NetRadiant.app/Contents/MacOS/radiant     |   0
 .../Contents/Resources/etc/fonts/fonts.conf   |   0
 .../Contents/Resources/etc/gtk-2.0/gtkrc      |   0
 .../Contents/Resources/etc/pango/pangorc      |   0
 .../Contents/Resources/lib/.turd              |   0
 .../Contents/Resources/radiant.icns           | Bin
 .../Resources/share/gtk-2.0/icons/.turd       |   0
 .../Resources/share/gtk-2.0/themes/.turd      |   0
 setup/apple/README.md                         |  50 ++++++++++++++++++
 setup/data/osx/README.md                      |  50 ------------------
 13 files changed, 51 insertions(+), 51 deletions(-)
 rename setup/{data/osx => apple}/.gitignore (100%)
 rename setup/{data/osx => apple}/Makefile (98%)
 rename setup/{data/osx => apple}/NetRadiant.app/Contents/Info.plist (100%)
 rename setup/{data/osx => apple}/NetRadiant.app/Contents/MacOS/radiant (100%)
 rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf (100%)
 rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc (100%)
 rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/etc/pango/pangorc (100%)
 rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/lib/.turd (100%)
 rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/radiant.icns (100%)
 rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd (100%)
 rename setup/{data/osx => apple}/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd (100%)
 create mode 100644 setup/apple/README.md
 delete mode 100644 setup/data/osx/README.md

diff --git a/setup/data/osx/.gitignore b/setup/apple/.gitignore
similarity index 100%
rename from setup/data/osx/.gitignore
rename to setup/apple/.gitignore
diff --git a/setup/data/osx/Makefile b/setup/apple/Makefile
similarity index 98%
rename from setup/data/osx/Makefile
rename to setup/apple/Makefile
index eb9ecadf..cf85d979 100644
--- a/setup/data/osx/Makefile
+++ b/setup/apple/Makefile
@@ -1,6 +1,6 @@
 # Makefile for NetRadiant.app, requires http://macdylibbundler.sourceforge.net/
 
-INSTALL = ../../../install
+INSTALL = ../../install
 TARGET = target
 RESOURCES = $(TARGET)/NetRadiant.app/Contents/Resources
 BINDIR = $(RESOURCES)/install
diff --git a/setup/data/osx/NetRadiant.app/Contents/Info.plist b/setup/apple/NetRadiant.app/Contents/Info.plist
similarity index 100%
rename from setup/data/osx/NetRadiant.app/Contents/Info.plist
rename to setup/apple/NetRadiant.app/Contents/Info.plist
diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/radiant b/setup/apple/NetRadiant.app/Contents/MacOS/radiant
similarity index 100%
rename from setup/data/osx/NetRadiant.app/Contents/MacOS/radiant
rename to setup/apple/NetRadiant.app/Contents/MacOS/radiant
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf b/setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf
similarity index 100%
rename from setup/data/osx/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf
rename to setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc b/setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc
similarity index 100%
rename from setup/data/osx/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc
rename to setup/apple/NetRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/etc/pango/pangorc b/setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc
similarity index 100%
rename from setup/data/osx/NetRadiant.app/Contents/Resources/etc/pango/pangorc
rename to setup/apple/NetRadiant.app/Contents/Resources/etc/pango/pangorc
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/lib/.turd b/setup/apple/NetRadiant.app/Contents/Resources/lib/.turd
similarity index 100%
rename from setup/data/osx/NetRadiant.app/Contents/Resources/lib/.turd
rename to setup/apple/NetRadiant.app/Contents/Resources/lib/.turd
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/radiant.icns b/setup/apple/NetRadiant.app/Contents/Resources/radiant.icns
similarity index 100%
rename from setup/data/osx/NetRadiant.app/Contents/Resources/radiant.icns
rename to setup/apple/NetRadiant.app/Contents/Resources/radiant.icns
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd b/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd
similarity index 100%
rename from setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd
rename to setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd
diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd b/setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd
similarity index 100%
rename from setup/data/osx/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd
rename to setup/apple/NetRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd
diff --git a/setup/apple/README.md b/setup/apple/README.md
new file mode 100644
index 00000000..069cf3db
--- /dev/null
+++ b/setup/apple/README.md
@@ -0,0 +1,50 @@
+NetRadiant for Apple OS X
+========================
+
+This directory provides packaging steps for NetRadiant for OS X. This document describes compiling the application on OSX as well as generating distributable bundles using the framework provided in this directory.
+
+Dependencies & Compilation
+--------------------------
+
+Directions for OS X Yosemite 10.10 - your mileage may vary:
+
+- Install [MacPorts](http://macports.org).
+- Install [XQuartz](http://xquartz.macosforge.org/)
+
+- Install dependencies with MacPorts:
+
+```
+sudo port install dylibbundler pkgconfig gtkglext
+```
+
+- Get the NetRadiant code and compile:
+
+```
+git clone https://gitlab.com/xonotic/netradiant.git
+cd netradiant/
+make
+```
+
+- Run the build:
+
+(from the netradiant/ directory)
+```
+./install/radiant
+```
+
+XQuartz note: on my configuration XQuartz doesn't automatically start for some reason. I have to open another terminal, and run the following command: `/Applications/Utilities/XQuartz.app/Contents/MacOS/X11.bin`, then start radiant. 
+    
+Building NetRadiant.app
+-----------------------
+
+The `Makefile` in the 'setup/apple/' directory will produce a distributable .app bundle for NetRadiant using `dylibbundler`:
+
+```
+make
+make image
+```
+
+Getting help
+------------
+
+IRC: Quakenet #xonotic, or post something on the issue tracker..
diff --git a/setup/data/osx/README.md b/setup/data/osx/README.md
deleted file mode 100644
index 8122c170..00000000
--- a/setup/data/osx/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-GtkRadiant for Apple OSX
-========================
-
-This directory provides packaging steps for GtkRadiant for OSX. This document describes compiling the application on OSX as well as generating distributable bundles using the framework provided in this directory.
-
-Dependencies & Compilation
---------------------------
-
-Directions for OSX Mavericks 10.9 - your mileage may vary:
-
-- Install [MacPorts](http://macports.org).
-- Install [XQuartz](http://xquartz.macosforge.org/)
-
-- Install dependencies with MacPorts:
-
-```
-sudo port install dylibbundler pkgconfig gtkglext scons
-```
-
-- Get the GtkRadiant code and compile:
-
-```
-git clone https://github.com/TTimo/GtkRadiant.git
-cd GtkRadiant/
-scons
-```
-
-- Run the build:
-
-(from the GtkRadiant/ directory)
-```
-./install/radiant.bin
-```
-
-XQuartz note: on my configuration XQuartz doesn't automatically start for some reason. I have to open another terminal, and run the following command: `/Applications/Utilities/XQuartz.app/Contents/MacOS/X11.bin`, then start radiant. 
-    
-Building GtkRadiant.app
------------------------
-
-The `Makefile` in the 'apple/' directory will produce a distributable .app bundle for GtkRadiant using `dylibbundler`:
-
-```
-make
-make image
-```
-
-Getting help
-------------
-
-Get on irc: Quakenet #radiant, or ask on the mailing list, or post something on the issue tracker..

From af443b859dba7f59f4cb442c45e274dabb4ff831 Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sat, 14 Feb 2015 10:25:03 -0500
Subject: [PATCH 06/11] Update Makefile to remove OSX build diretives. We build
 for OSX just like its Linux now. Those wishing to build the app bundle should
 use setup/apple/Makefile.

---
 Makefile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Makefile b/Makefile
index 9eee1212..1fe334df 100644
--- a/Makefile
+++ b/Makefile
@@ -233,8 +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))
@@ -1045,7 +1043,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
@@ -1059,14 +1056,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

From 5ad8b3a43e69fb556f6b4cbbadec8bcd9ba92b9b Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sat, 14 Feb 2015 10:25:30 -0500
Subject: [PATCH 07/11] Update .gitignore to include games directory.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b1c030fc..74be63cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.[oda]
+games
 install

From c359b728f63d9fe2adc84f88ec36639e61a4a05a Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sun, 15 Feb 2015 10:13:20 -0500
Subject: [PATCH 08/11] Try ~/.{prefix} on Apple OS X if /Library/Application
 Support/{prefix+1} fails.

---
 radiant/mainframe.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index abb12ef6..a9c97072 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -200,6 +200,8 @@ void HomePaths_Realise(){
 				g_qeglobals.m_userEnginePath = path.c_str();
 				break;
 			}
+			path.clear();
+			path << DirectoryCleaned( g_get_home_dir() ) << prefix << "/";
 #endif
 
 #if defined( WIN32 )
@@ -3324,10 +3326,10 @@ void MainFrame_Construct(){
 		const char* ENGINEPATH_ATTRIBUTE =
 #if defined( WIN32 )
 			"enginepath_win32"
-#elif defined( __linux__ ) || defined ( __FreeBSD__ )
-			"enginepath_linux"
 #elif defined( __APPLE__ )
 			"enginepath_macos"
+#elif defined( __linux__ ) || defined ( __FreeBSD__ )
+			"enginepath_linux"
 #else
 #error "unknown platform"
 #endif

From 85332bd850d0014976612fe49f1bd9e09df4706a Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sun, 15 Feb 2015 10:13:54 -0500
Subject: [PATCH 09/11] .gitignore, .cproject

---
 .cproject  | 21 +++++++++++++++++++++
 .gitignore |  1 +
 2 files changed, 22 insertions(+)

diff --git a/.cproject b/.cproject
index 409a9c07..4a2a3989 100644
--- a/.cproject
+++ b/.cproject
@@ -20,9 +20,22 @@
 							<tool id="cdt.managedbuild.tool.llvm.assembler.base.1540137577" name="LLVM assembler" superClass="cdt.managedbuild.tool.llvm.assembler.base"/>
 							<tool id="cdt.managedbuild.tool.llvm.archiver.base.726448752" name="LLVM archiver" superClass="cdt.managedbuild.tool.llvm.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.llvm.c.compiler.base.423406515" name="LLVM Clang" superClass="cdt.managedbuild.tool.llvm.c.compiler.base">
+								<option id="llvm.c_cpp.compiler.option.include.paths.1177478676" name="Include paths (-I)" superClass="llvm.c_cpp.compiler.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="/opt/local/include"/>
+									<listOptionValue builtIn="false" value="/opt/local/include/glib-2.0"/>
+									<listOptionValue builtIn="false" value="/opt/local/include/gtk-2.0"/>
+								</option>
 								<inputType id="cdt.managedbuild.tool.llvm.c.compiler.input.1702833029" superClass="cdt.managedbuild.tool.llvm.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.llvm.cpp.compiler.base.1130692273" name="LLVM Clang++" superClass="cdt.managedbuild.tool.llvm.cpp.compiler.base">
+								<option id="llvm.c_cpp.compiler.option.include.paths.1703680230" name="Include paths (-I)" superClass="llvm.c_cpp.compiler.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="/opt/local/include"/>
+									<listOptionValue builtIn="false" value="/opt/local/include/gtk-2.0"/>
+									<listOptionValue builtIn="false" value="/opt/local/include/glib-2.0"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/NetRadiant/plugins}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/NetRadiant/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/NetRadiant/radiant}&quot;"/>
+								</option>
 								<inputType id="cdt.managedbuild.tool.llvm.cpp.compiler.input.1553525897" superClass="cdt.managedbuild.tool.llvm.cpp.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.llvm.c.linker.base.391098519" name="LLVM Clang C linker" superClass="cdt.managedbuild.tool.llvm.c.linker.base"/>
@@ -34,6 +47,9 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+					</sourceEntries>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
@@ -46,4 +62,9 @@
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Default">
+			<resource resourceType="PROJECT" workspacePath="/NetRadiant"/>
+		</configuration>
+	</storageModule>
 </cproject>
diff --git a/.gitignore b/.gitignore
index 74be63cc..bbcc964d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.[oda]
+.settings
 games
 install

From d9a21ba8655c4d2c7dc0ef1945cdc38f72ad26bb Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Tue, 17 Feb 2015 09:03:16 -0500
Subject: [PATCH 10/11] Update Quake2WorldPack source URL.

---
 download-gamepacks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download-gamepacks.sh b/download-gamepacks.sh
index 7717cd2d..d573d60f 100755
--- a/download-gamepacks.sh
+++ b/download-gamepacks.sh
@@ -153,7 +153,7 @@ pack OpenArenaPack   unknown     zip1   http://ingar.satgnu.net/files/gtkradiant
 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/

From 5a29db47f6598cd72b08b3e0cbb1af49f9bca29a Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Tue, 17 Feb 2015 09:34:32 -0500
Subject: [PATCH 11/11] Filter non-diffuse textures (bump, glow, local, spec,
 etc) from texture browser.

---
 libs/shaderlib.h     | 13 ++++++++++++-
 libs/string/string.h |  7 +++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/libs/shaderlib.h b/libs/shaderlib.h
index ee972437..c4e5ba3b 100644
--- a/libs/shaderlib.h
+++ b/libs/shaderlib.h
@@ -50,6 +50,16 @@ bool operator()( const CopiedString& shader, const CopiedString& other ) const {
 }
 };
 
+static inline bool shader_is_diffuse( const char *shader ){
+	return !string_equal_suffix( shader, "_bump" )
+		   && !string_equal_suffix( shader, "_glow" )
+		   && !string_equal_suffix( shader, "_h" )
+		   && !string_equal_suffix( shader, "_local" )
+		   && !string_equal_suffix( shader, "_luma" )
+		   && !string_equal_suffix( shader, "_nm" )
+		   && !string_equal_suffix( shader, "_s" );
+}
+
 inline bool shader_valid( const char* shader ){
 	return string_is_ascii( shader )
 		   && strchr( shader, ' ' ) == 0
@@ -57,7 +67,8 @@ inline bool shader_valid( const char* shader ){
 		   && strchr( shader, '\r' ) == 0
 		   && strchr( shader, '\t' ) == 0
 		   && strchr( shader, '\v' ) == 0
-		   && strchr( shader, '\\' ) == 0;
+		   && strchr( shader, '\\' ) == 0
+		   && shader_is_diffuse( shader );
 }
 
 inline const char* GlobalTexturePrefix_get(){
diff --git a/libs/string/string.h b/libs/string/string.h
index a6de0673..826d4a93 100644
--- a/libs/string/string.h
+++ b/libs/string/string.h
@@ -141,6 +141,13 @@ inline bool string_equal_prefix( const char* string, const char* prefix ){
 	return string_equal_n( string, prefix, string_length( prefix ) );
 }
 
+/// \brief Returns true if the ending of \p string is equal to \p suffix.
+/// O(n)
+inline bool string_equal_suffix( const char* string, const char* suffix){
+	const char *s = string + string_length( string ) - string_length( suffix );
+	return string_equal_n( s , suffix, string_length( suffix ) );
+}
+
 /// \brief Copies \p other into \p string and returns \p string.
 /// Assumes that the space allocated for \p string is at least string_length(other) + 1.
 /// O(n)