Merge pull request #851 from PorktoberRevolution/master

Release 1.1.1
PorktoberRevolution · May 3, 2020 · 05c95e8 · 05c95e8
2 parents e696ea7 + becf643
commit 05c95e8
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 11 deletions.
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-2.mu
diff --git a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll
diff --git a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":1,
         "MINOR":1,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt
@@ -1,3 +1,8 @@
+v1.1.1
+------
+- Fixed Skipper UV issue inside bell
+- Fixed fix for radiator breakage not being included
+
 v1.1.0
 -----
 - KSP 1.9

diff --git a/Distribution/Restock/readme.txt b/Distribution/Restock/readme.txt
@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.1.0
+RESTOCK 1.1.1
 =============
 
 Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the canceled Part Overhaul project by Porkjet.

diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
@@ -102,7 +102,7 @@ PART
   category = Engine
   subcategory = 0
   title = #LOC_RestockPlus_restock-engine-torch_title
-  manufacturer = #autoLOC_501638
+  manufacturer = #autoLOC_501637
   description = #LOC_RestockPlus_restock-engine-torch_description
   // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
   attachRules = 1,1,1,0,0

diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-cherenkov.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-cherenkov.cfg
@@ -48,13 +48,11 @@ PART
       AUDIO
       {
         channel = Ship
-        clip = sound_rocket_spurts
+        clip = sound_rocket_hard
         volume = 0.0 0.0
-        volume = 0.01 0.4
         volume = 1.0 1.0
         pitch = 0.0 0.2
-        pitch = 0.01 0.6
-        pitch = 1.0 1.8
+        pitch = 1.0 1.0
         loop = true
       }
       MODEL_MULTI_PARTICLE
@@ -96,13 +94,13 @@ PART
     }
   }
   // --- editor parameters ---
-  TechRequired = veryHeavyRocketry
+  TechRequired = nuclearPropulsion
   entryCost = 121000
   cost = 40000
   category = Engine
   subcategory = 0
   title = #LOC_RestockPlus_restock-engine-cherenkov_title
-  manufacturer = #autoLOC_501638
+  manufacturer = #autoLOC_501637
   description = #LOC_RestockPlus_restock-engine-cherenkov_description
   // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
   attachRules = 1,1,1,0,0

diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":1,
         "MINOR":1,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt
@@ -1,3 +1,9 @@
+v1.1.1
+------
+- Cherenkov running sound is now same as LV-N, not Spark
+- Cherenkov tech node is now correctly Nuclear Propulsion
+- Torch, Cherenkov manufacturers corrected to Rockomax, was Kerbodyne
+
 v1.1.0
 ------
 - KSP 1.9 Compatibility

diff --git a/Distribution/RestockPlus/readme.txt b/Distribution/RestockPlus/readme.txt
@@ -1,5 +1,5 @@
 ==============
-RESTOCK+ 1.1.0
+RESTOCK+ 1.1.1
 ==============
 
 Restock+ is a complement to Restock which adds useful parts that we feel are missing from the base game. Functionally, these parts additions allow better flexibility in craft construction and not add new gameplay systems or form factors. Some examples might include:

diff --git a/Source/Restock/Restock.csproj b/Source/Restock/Restock.csproj
@@ -55,6 +55,7 @@
     <Compile Include="MaterialModifiers\IMaterialModifier.cs" />
     <Compile Include="MaterialModifiers\MaterialModifierParser.cs" />
     <Compile Include="MaterialModifiers\TexturePropertyMaterialModifier.cs" />
+    <Compile Include="ModuleRestockDeployableMeshHider.cs" />
     <Compile Include="ModuleRestockLaunchClamp.cs" />
     <Compile Include="ModuleRestockLinkedMesh.cs" />
     <Compile Include="ModuleRestockDepthMask.cs" />