Merge pull request #24 from WaveFunctionP/development

Development merge to Master
confusingbits · Aug 26, 2014 · 0ce939e · 0ce939e
2 parents 8fa69fd + 0cb18c9
commit 0ce939e
Show file tree

Hide file tree

Showing 559 changed files with 7,385 additions and 7,371 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 *.userprefs
-FNPlugin/bin
-FNPlugin/obj
-FNPlugin/WarpPlugin
+InterstellarPLugin/bin
+InterstellarPlugin/obj
+InterstellarPlugin/Interstellar
 OpenResourceSystem/bin
 OpenResourceSystem/obj
 OpenResourceSystem/OpenResourceSystem

diff --git a/FNPlugin/FNGenerator.cs b/FNPlugin/FNGenerator.cs
diff --git a/FNPlugin/FNModuleResourceExtraction.cs b/FNPlugin/FNModuleResourceExtraction.cs