Merge pull request #26 from ihsoft/next

Release 1.15
ihsoft · Dec 2, 2019 · 3e45742 · 3e45742
2 parents fa99efb + 66d7a81
commit 3e45742
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 18 deletions.
diff --git a/Binaries/MiniAVC.dll b/Binaries/MiniAVC.dll
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
-# 1.14 (October 27rd, 2019):
+# 1.15 (December 1st, 2019):
+* [Fix #25] Stock lights don't emit light, conflict with Restock.
+
+# 1.14 (October 27th, 2019):
 * [Change] `KSP 1.8` compatibility. __WARNING__: the mod won't work with version lower than `KSP 1.8`!
 
 # 1.13 (April 23rd, 2019):

diff --git a/Deps/ModuleManager.4.0.2.dll b/Deps/ModuleManager.4.0.2.dll
diff --git a/Deps/ModuleManager.4.1.3.dll b/Deps/ModuleManager.4.1.3.dll
diff --git a/Patches/MM-StockLights.cfg b/Patches/MM-StockLights.cfg
@@ -9,12 +9,12 @@
  %lightB = 0.8
  lensBrightness = 0.4
  }
- @tags ^= :^:cck-lights
+ @tags ^= : ^:cck-lights :
 }
 
 // ReStock'ed parts can support colored lenses naturally.
 // See: https://github.com/PorktoberRevolution/ReStocked
-@PART[spotLight1,spotLight2]:NEEDS[ReStock]
+@PART[spotLight1,spotLight2]:NEEDS[ReStock]:AFTER[ReStock]
 {
  @MODULE[ModuleLight]
  {
@@ -24,5 +24,5 @@
  %lightB = 0.8
  lensBrightness = 0.4
  }
- @tags ^= :^:cck-lights
+ @tags ^= :^:cck-lights :
 }
diff --git a/Source/ModuleColoredLensLight.cs b/Source/ModuleColoredLensLight.cs
@@ -3,7 +3,6 @@
 // Author: igor.zavoychinskiy@gmail.com 
 // License: Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International.
 
-using System;
 using System.Linq;
 using UnityEngine;
 
@@ -79,7 +78,7 @@ public virtual void UpdateLightTextureColor() {
 
  /// <summary>Returns a color to set on the emission texture.</summary>
  /// <remarks>Using raw color looks kinda ugly, so do some minor filtering. Add an intensity offset
- /// to the light's color to make the texture be colored even when the lgiht is turned off.
+ /// to the light's color to make the texture be colored even when the light is turned off.
  /// </remarks>
  protected virtual Color GetLightTextureColor() {
  return new Color(lightR * (1.0f - lensBrightness) + lensBrightness,

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -24,8 +24,8 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion ("1.14.*")]
-[assembly: AssemblyInformationalVersion ("1.14 for KSP v1.8+")]
+[assembly: AssemblyVersion ("1.15.*")]
+[assembly: AssemblyInformationalVersion ("1.15 for KSP v1.8+")]
 [assembly: Guid ("a4d0ab40-75bd-44fb-80bc-f50c194faf4c")]
-[assembly: KSPAssembly ("SurfaceLights", 1, 14)]
+[assembly: KSPAssembly ("SurfaceLights", 1, 15)]
 [assembly: AssemblyFlags (AssemblyNameFlags.PublicKey | AssemblyNameFlags.EnableJITcompileOptimizer)]
diff --git a/Source/SurfaceLights.csproj b/Source/SurfaceLights.csproj
@@ -48,9 +48,8 @@
  <StartAction>Project</StartAction>
  </PropertyGroup>
  <ItemGroup>
- <Reference Include="Assembly-CSharp">
+ <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
  <HintPath>Q:\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
- <Private>False</Private>
  </Reference>
  <Reference Include="Microsoft.CSharp">
  <RequiredTargetFramework>4.0</RequiredTargetFramework>
@@ -80,6 +79,6 @@
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
- <PostBuildEvent>IF EXIST "Q:\GameData\SurfaceLights" xcopy "$(TargetDir)*.dll" "Q:\GameData\SurfaceLights\Plugins\" /Y</PostBuildEvent>
+ <PostBuildEvent>IF EXIST "Q:\GameData\SurfaceLights" xcopy "$(TargetPath)" "Q:\GameData\SurfaceLights\Plugins\" /Y</PostBuildEvent>
  </PropertyGroup>
 </Project>
diff --git a/SurfaceLights.version b/SurfaceLights.version
@@ -19,9 +19,9 @@
  "NAME": "Surface Mounted Lights", 
  "URL": "https://raw.githubusercontent.com/ihsoft/SurfaceLights/master/SurfaceLights.version", 
  "VERSION": {
- "BUILD": 37956, 
+ "BUILD": 38376, 
  "MAJOR": 1, 
- "MINOR": 14, 
- "PATCH": 7239
+ "MINOR": 15, 
+ "PATCH": 7274
  }
 }
diff --git a/Tools/publish_curseforge_args.txt b/Tools/publish_curseforge_args.txt
@@ -4,4 +4,4 @@
 --github=ihsoft/SurfaceLights
 --versions=latest_all_builds
 --title=SurfaceLights {tag}
---archive=../SurfaceLights_v1.14.zip
+--archive=../SurfaceLights_v1.15.zip
diff --git a/Tools/publish_github_args.txt b/Tools/publish_github_args.txt
@@ -4,4 +4,4 @@
 --changelog=../CHANGELOG.md
 --as_draft
 --title=SurfaceLights v{tag}
---archive=../SurfaceLights_v1.14.zip
+--archive=../SurfaceLights_v1.15.zip
diff --git a/Tools/publish_spacedock_args.txt b/Tools/publish_spacedock_args.txt
@@ -3,4 +3,4 @@
 --changelog=../CHANGELOG.md
 --github=ihsoft/SurfaceLights
 --ksp_version=latest
---archive=../SurfaceLights_v1.14.zip
+--archive=../SurfaceLights_v1.15.zip