Merge pull request #963 from PorktoberRevolution/master

Prepare 1.4.1
PorktoberRevolution · Jul 21, 2021 · abab0d1 · abab0d1
2 parents 6472cce + e9cc0c4
commit abab0d1
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 4 deletions.
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-2.mu
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1.mu
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1.mu
diff --git a/...ibution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-shrouded-1.mu b/...ibution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-shrouded-1.mu
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-boar-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-boar-1.mu
diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist
@@ -30,6 +30,8 @@ Squad/Parts/Command/probeStackLarge/
 Squad/Parts/Command/probeStackSmall/
 Squad/Parts/Command/probeStackSphere_v2/
 Squad/Parts/CompoundParts/
+Squad/Parts/Electrical/10CSolarPanels/
+Squad/Parts/Electrical/10LSolarPanels/
 Squad/Parts/Electrical/1x6ShroudSolarPanels/
 Squad/Parts/Electrical/1x6SolarPanels/
 Squad/Parts/Electrical/3x2ShroudSolarPanels/

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":4,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt
@@ -1,3 +1,10 @@
+v1.4.1
+------
+- Numerous fixes to circular solar panel model (shrouded and not)
+- Fixed Clamp-O-Tron Sr. docking port shader being emissive when it wasn't supposed to be
+- Moved alignment arrows closer to the surface on Mk1 Inline Docking port
+- Fixed new solar panel assets not being blacklisted appropriately
+
 v1.4.0
 ------
 - KSP 1.12

diff --git a/Distribution/Restock/readme.txt b/Distribution/Restock/readme.txt
@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.4.0
+RESTOCK 1.4.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/Versioning/ReStockPlus.version b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":1,
         "MINOR":4,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt
@@ -1,3 +1,7 @@
+v1.4.1
+------
+- Fixed Boar additional extraneous boattail mesh
+
 v1.4.0
 ------
 - KSP 1.12

diff --git a/Distribution/RestockPlus/readme.txt b/Distribution/RestockPlus/readme.txt
@@ -1,5 +1,5 @@
 ==============
-RESTOCK+ 1.4.0
+RESTOCK+ 1.4.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: