Merge pull request #233 from DMagic1/release

Version 16.5
S-C-A-N · Aug 10, 2016 · e1b5104 · e1b5104
2 parents ee4e155 + 46d64b6
commit e1b5104
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/SCANassets/SCANsat.version b/SCANassets/SCANsat.version
@@ -11,7 +11,7 @@
          "MAJOR":1,
          "MINOR":1,
          "PATCH":6,
-         "BUILD":4
+         "BUILD":5
      },
      "KSP_VERSION":{
          "MAJOR":1,

diff --git a/SCANmechjeb/Properties/AssemblyInfo.cs b/SCANmechjeb/Properties/AssemblyInfo.cs
@@ -32,9 +32,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.4")]
-[assembly: AssemblyFileVersion("1.6.0.4")]
-[assembly: AssemblyInformationalVersion ("v16.4")]
+[assembly: AssemblyVersion("1.6.0.5")]
+[assembly: AssemblyFileVersion("1.6.0.5")]
+[assembly: AssemblyInformationalVersion ("v16.5")]
 
 [assembly: KSPAssembly ("SCANmechjeb", 0, 4)]
 [assembly: KSPAssemblyDependency ("SCANsat", 1, 6)]

diff --git a/SCANsat/CHANGELOG.txt b/SCANsat/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Version 16.5 - 2016-8-10
+------------------------
+
+- Fix bug in electricity usage that was preventing scanning
+
 Version 16.4 - 2016-8-9
 ------------------------
 

diff --git a/SCANsat/Properties/AssemblyInfo.cs b/SCANsat/Properties/AssemblyInfo.cs
@@ -14,9 +14,9 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.6.0.4")]
-[assembly: AssemblyFileVersion ("1.6.0.4")]
-[assembly: AssemblyInformationalVersion ("v16.4")]
+[assembly: AssemblyVersion ("1.6.0.5")]
+[assembly: AssemblyFileVersion ("1.6.0.5")]
+[assembly: AssemblyInformationalVersion ("v16.5")]
 
 [assembly: KSPAssembly ("SCANsat", 1, 6)]
 

diff --git a/SCANsat/SCAN_PartModules/SCANsat.cs b/SCANsat/SCAN_PartModules/SCANsat.cs
@@ -170,7 +170,7 @@ protected virtual void FixedUpdate()
 							ModuleResource resource = resourceInputs[i];
 							resource.currentRequest = resource.rate * TimeWarp.fixedDeltaTime;
 							resource.currentAmount = part.RequestResource(resource.id, resource.currentRequest);
-							if (resource.currentAmount < resource.currentRequest)
+							if (resource.currentAmount < resource.currentRequest * 0.9)
 							{
 								unregisterScanner();
 								powerIsProblem = true;
@@ -244,9 +244,9 @@ public override string GetInfo()
 			if (max_alt != 0)
 				str += "Altitude ( max): " + (max_alt / 1000).ToString("F0") + " km\n";
 			if (fov != 0)
-				str += "FOV: " + fov.ToString("F0") + " °\n";
+				str += "FOV: " + fov.ToString("F0") + " °";
 			if (resourceInputs.Count > 0)
-				str += PartModuleUtil.PrintResourceRequirements("Requires:", resourceInputs.ToArray());
+				str += PartModuleUtil.PrintResourceRequirements("Requires:", resourceInputs.ToArray()) + "\n";
 			return str;
 		}