diff --git a/.travis.yml b/.travis.yml index 993819c7..983a4de7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ script: - cd build-deploy - git checkout master - cd .. + - pytest -s --testpath "Distribution/" build-deploy/src/tests/ # run the deploy tests - python build-deploy/src/package.py --f "Distribution/Restock/.mod_data.yml" # Build RS package - python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml" # Build RS+ package before_deploy: diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-2.mu index a252f16a..a5255e8a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-3.mu index 74c79d6e..1cfb522c 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-3.mu and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-3.mu index 9eb02424..6faff9c6 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-3.mu and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-4.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-4.mu index a35eb564..63824ba2 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-4.mu and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-4.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu index 516fa901..d3a9f88a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-2.mu index a0e214d9..a5734479 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg index 58a55fd7..01ba2ac6 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg +++ b/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 - //} -} \ No newline at end of file +} diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 56685fb3..94674b40 100644 --- a/Distribution/Restock/changelog.txt +++ b/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) diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 54b088bd..7ea97226 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -24,6 +24,7 @@ v0.1.0 - New Coupling parts - TD-18 Stack Decoupler (Nertea): 1.875m decoupler. Replaces MH decoupler if installed - TS-18 Stack Separator (Nertea): 1.875m separator. Replaces MH separator if installed + - TT-14 Decoupler (Nertes): Tiny radial decoupler suitable for 0.625m boosters - Clamp-O-Tron Docking Port 'Grande' (Nertea): 3.75m docking port - New Structural parts - Kerbodyne ADTP-2-3A (Nertea): A hollow version of the fuelled 3.75 to 2.5m adapter