Merge branch 'master' of https://github.com/PorktoberRevolution/ReStocked

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg

@@ -1,8 +1,8 @@
 // Patches applying art changes to solar panels
 // Contents:
-// -  (solarPanels4)
-// -  (solarPanels2)
-// -  (solarPanels3)
+// - OX-4L 1x6 Photovoltaic Panels (solarPanels4)
+// - SP-L 1x6 Photovoltaic Panels (solarPanels3)
+// - OX-4W 3x2 Photovoltaic Panels (solarPanels2)
 // - SP-W 3x2 Photovoltaic Panels (solarPanels1)
 // - Gigantor XL Solar Array (largeSolarPanel)
 // - OX-STAT Photovoltaic Panels (solarPanels5)
@@ -51,6 +51,7 @@
       {
         name = _Shininess
         value = 0.7
+
       }
     }
   }
@@ -77,7 +78,7 @@
   MODULE
   {
     name = ModuleRestockModifyMaterials
-    
+
     MATERIAL
     {
       shader = KSP/Bumped Specular (Mapped)
@@ -201,7 +202,6 @@
   }
 }
 
-
 // Gigantor
 @PART[largeSolarPanel]
 {
@@ -230,10 +230,6 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
-  //MODEL
-  //{
-    //model = Squad/Parts/Electrical/radialFlatSolarPanel/model
-  //}
 }
 
 // Gigantor
@@ -249,8 +245,4 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
-  //MODEL
-  //{
-    //model = Squad/Parts/Misc/AsteroidDay/LgRadialSolar
-  //}
-}
+}

Distribution/Restock/changelog.txt

@@ -130,6 +130,13 @@
   - Z-400 Rechargeable Battery (Nertea)
   - Z-100 Rechargeable Battery Pack (Nertea)
   - PB-NUK Radioisotope Thermoelectric Generator (Beale)
+  - OX-4L 1x6 Photovoltaic Panels (Beale)
+  - SP-L 1x6 Photovoltaic Panels (Beale)
+  - OX-4W 3x2 Photovoltaic Panels (Beale)
+  - SP-W 3x2 Photovoltaic Panels (Beale)
+  - Gigantor XL Solar Array (Nertea)
+  - OX-STAT Photovoltaic Panels (Nertea)
+  - OX-STAT-XL Photovoltaic Panels (Nertea)
  - Science
   - Science Mobile Processing Lab MPL-LG-2 (Nertea)
   - Thermometer (Andrew Cassidy)