Merge pull request #51 from Zarby89/Dev-3.1.2-true

Dev 3.1.2 true into dev

.gitignore

@@ -1,10 +1,5 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
-<<<<<<< HEAD
-=======
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 
 # User-specific files
 *.suo
@@ -20,35 +15,21 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-<<<<<<< HEAD
+
 [Xx]64/
 [Xx]86/
+[Bb]ld/
 [Bb]uild/
-bld/
-[Bb]in/
-[Oo]bj/
-
-# Visual Studio 2015 cache/options directory
-=======
-x64/
-x86/
-bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
 
-# Visual Studio 2015/2017 cache/options directory
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
-.vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
-<<<<<<< HEAD
-=======
 # Visual Studio 2017 auto generated files
 Generated\ Files/
 
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -62,12 +43,6 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
-<<<<<<< HEAD
-# DNX
-project.lock.json
-artifacts/
-
-=======
 # Benchmark Results
 BenchmarkDotNet.Artifacts/
 
@@ -81,22 +56,16 @@ artifacts/
 StyleCopReport.xml
 
 # Files built by Visual Studio
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 *_i.c
 *_p.c
 *_i.h
 *.ilk
 *.meta
 *.obj
-<<<<<<< HEAD
-*.pch
-*.pdb
-=======
 *.iobj
 *.pch
 *.pdb
 *.ipdb
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 *.pgc
 *.pgd
 *.rsp
@@ -126,23 +95,16 @@ ipch/
 *.sdf
 *.cachefile
 *.VC.db
-<<<<<<< HEAD
-=======
 *.VC.VC.opendb
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
 *.sap
 
-<<<<<<< HEAD
-=======
 # Visual Studio Trace Files
 *.e2e
-
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 # TFS 2012 Local Workspace
 $tf/
 
@@ -163,8 +125,6 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
-<<<<<<< HEAD
-=======
 # AxoCover is a Code Coverage Tool
 .axoCover/*
 !.axoCover/settings.json
@@ -173,7 +133,6 @@ _TeamCity*
 *.coverage
 *.coveragexml
 
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
@@ -205,24 +164,7 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-<<<<<<< HEAD
-
-# TODO: Un-comment the next line if you do not want to checkin
-# your web deploy settings because they may include unencrypted
-# passwords
-#*.pubxml
-*.publishproj
 
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-=======
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
@@ -242,7 +184,6 @@ PublishScripts/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/[Pp]ackages/repositories.config
 # NuGet v3's project.json files produces more ignorable files
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 *.nuget.props
 *.nuget.targets
 
@@ -254,18 +195,12 @@ csx/
 ecf/
 rcf/
 
-<<<<<<< HEAD
-# Windows Store app package directory
-AppPackages/
-BundleArtifacts/
-=======
 # Windows Store app package directories and files
 AppPackages/
 BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -275,25 +210,18 @@ _pkginfo.txt
 
 # Others
 ClientBin/
-<<<<<<< HEAD
 [Ss]tyle[Cc]op.*
-=======
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
+
 ~$*
 *~
 *.dbmdl
 *.dbproj.schemaview
-<<<<<<< HEAD
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
 
-=======
 *.jfm
 *.pfx
 *.publishsettings
 orleans.codegen.cs
+node_modules/
 
 # Including strong name files can present a security risk 
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
@@ -303,7 +231,6 @@ orleans.codegen.cs
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
 
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 # RIA/Silverlight projects
 Generated_Code/
 
@@ -314,28 +241,19 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
-<<<<<<< HEAD
-=======
 ServiceFabricBackup/
 *.rptproj.bak
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 
 # SQL Server files
 *.mdf
 *.ldf
-<<<<<<< HEAD
-=======
 *.ndf
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 
 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
-<<<<<<< HEAD
-=======
 *.rptproj.rsuser
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -345,23 +263,17 @@ FakesAssemblies/
 
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
-<<<<<<< HEAD
-=======
 node_modules/
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 
 # Visual Studio 6 build log
 *.plg
 
 # Visual Studio 6 workspace options file
 *.opt
 
-<<<<<<< HEAD
-=======
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -370,17 +282,10 @@ node_modules/
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions
 
-<<<<<<< HEAD
 # LightSwitch generated files
 GeneratedArtifacts/
 ModelManifest.xml
 
-# Paket dependency manager
-.paket/paket.exe
-
-# FAKE - F# Make
-.fake/
-=======
 # Paket dependency manager
 .paket/paket.exe
 paket-files/
@@ -429,4 +334,6 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
->>>>>>> 3faf32346cb80d69e0b7754a5491f2e95f8715be
+
+ZeldaFullEditor/.editorconfig
+/.vs/ZeldaFullEditor/FileContentIndex