From 1d1841426fb1512d6da00b86bf2edeadd3eb6782 Mon Sep 17 00:00:00 2001
From: Taryn Hill <taryn@phrohdoh.com>
Date: Thu, 16 Feb 2017 21:57:22 -0600
Subject: [PATCH 1/3] Update engine to eaf55a864c58ac27bdaf9251603131e5c9d0dab4

---
 .gitmodules | 4 ++--
 engine      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 99c459c..6157176 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "engine"]
 	path = engine
-	url = https://github.com/pchote/OpenRA/
-	branch = engineargs
+	url = https://github.com/OpenRA/OpenRA/
+	branch = bleed
diff --git a/engine b/engine
index 2af03da..eaf55a8 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 2af03da82509ba4edb744c856b50c5a16ed75313
+Subproject commit eaf55a864c58ac27bdaf9251603131e5c9d0dab4

From 53fee8e8f24df51150bf92c92d2cc58ab2494ffb Mon Sep 17 00:00:00 2001
From: Taryn Hill <taryn@phrohdoh.com>
Date: Thu, 16 Feb 2017 21:59:15 -0600
Subject: [PATCH 2/3] Wrap usage of MODLAUNCHER in quotes

Paths on OS X / macOS contain a space that was causing dirname to fail
---
 launch-mod.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/launch-mod.sh b/launch-mod.sh
index d7cc01b..4c06884 100755
--- a/launch-mod.sh
+++ b/launch-mod.sh
@@ -5,8 +5,8 @@ MODID="example"
 
 # Don't edit below this line
 MODLAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
-MODROOT=$(dirname $MODLAUNCHER)
+MODROOT=$(dirname "$MODLAUNCHER")
 
 cd engine
 # TODO: Remove ./mods from the search path after we deprecate cross-mod references
-mono OpenRA.Game.exe Engine.LaunchPath="$MODLAUNCHER" "Engine.ModSearchPaths=./mods,$MODROOT/mods" Engine.DefaultMod=$MODID Game.Mod=$MODID "$@"
\ No newline at end of file
+mono OpenRA.Game.exe Engine.LaunchPath="$MODLAUNCHER" "Engine.ModSearchPaths=./mods,$MODROOT/mods" Engine.DefaultMod=$MODID Game.Mod=$MODID "$@"

From 98eb708b8743966caa12c0bb4110b0920e18c937 Mon Sep 17 00:00:00 2001
From: Taryn Hill <taryn@phrohdoh.com>
Date: Thu, 16 Feb 2017 22:01:06 -0600
Subject: [PATCH 3/3] Add a basic gitignore

---
 .gitignore | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..988e006
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+bin
+obj
+mods/*/*.dll
+mods/*/*.mdb
+mods/*/*.pdb
+/*.dll
+/*.dll.config
+/*.so
+/*.dylib
+/*.pdb
+/*.mdb
+/*.exe