Merge pull request #435 from FungusGames/rename-prefs

Renamed fungus.fungusprefs to fungus.prefs

Assets/Fungus/Lua/Resources/Lua/fungus.txt

@@ -134,8 +134,8 @@ end
 -- Fungus Prefs
 ---------------
 
--- prefs is a handy short alias to the real fungusprefs
+-- Handy short alias to the real prefs object
-M.prefs = unity.fungusprefs
+M.prefs = unity.prefs
 
 -------------
 -- Say Dialog

Assets/Fungus/Lua/Scripts/LuaUtils.cs

@@ -138,7 +138,7 @@ namespace Fungus
 
 			// Static classes
 			unityTable["time"] = UserData.CreateStatic(typeof(Time));
-			unityTable["fungusprefs"] = UserData.CreateStatic(typeof(FungusPrefs));
+			unityTable["prefs"] = UserData.CreateStatic(typeof(FungusPrefs));
 
 			UserData.RegisterType(typeof(PODTypeFactory));
 			unityTable["factory"] = UserData.CreateStatic(typeof(PODTypeFactory));

Assets/UnityTestTools/UnitTesting/Editor/NSubstitute/NSubstitute.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: 3c5e1afc6e0d68849ae6639aff58cfc7
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: