diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 97ad0359..39b06031 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -43,5 +43,7 @@ jobs: run: python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml" - name: Staging package run: python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script - - name: Deploying Restock + name: Deploying Restock + run: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy package to spacedock, curse, github + - name: Deploying RestockPlus run: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml" # Deploy package to spacedock, curse, github \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/blank.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/blank.dds index 186b5e18..845b2f6a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/blank.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/blank.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-silver.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-silver.dds index 8ef63ec9..34190c1f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-silver.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-silver.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1.dds index 90c98bc0..bd4bc208 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-2.mu index ac9c66dd..87fc1b59 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-mini-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-mini-1.mu index 663fcd9c..10300ef3 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-mini-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-mini-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank-n.dds index 186b5e18..845b2f6a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank.dds index 186b5e18..845b2f6a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.dds index fffb5394..77173719 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-s.dds index 9061ebaa..9eff04ae 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-s.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1.dds index 2ed5f549..3d9ad3a2 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.dds index fa340f06..78a09198 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu index e0de017f..0db7388f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-static-cells.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-static-cells.dds index 333641a1..7933be1a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-static-cells.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-static-cells.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/blank.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/blank.dds index 186b5e18..845b2f6a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/blank.dds and b/Distribution/Restock/GameData/ReStock/Assets/Engine/blank.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-s.dds index a5d8216f..c8c0fafe 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-s.dds and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil.dds index a9192fb9..9d5f2284 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil.dds and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.dds index 35c29bf1..d145a2a5 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-methalox-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-methalox-1.dds index cfcb0991..6aee9d55 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-methalox-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-methalox-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-purple-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-purple-1.dds index 6b273540..96a7e3b1 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-purple-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-purple-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1.dds index 4c5d5997..a8b217b1 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-silver-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-silver-1.dds index ab7ffd6a..4c66ce09 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-silver-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-silver-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/fx_blob04.dds b/Distribution/Restock/GameData/ReStock/FX/fx_blob04.dds index 864952af..dfb9b3dc 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/fx_blob04.dds and b/Distribution/Restock/GameData/ReStock/FX/fx_blob04.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/fx_blobGlow01.dds b/Distribution/Restock/GameData/ReStock/FX/fx_blobGlow01.dds index f993febe..be5f7402 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/fx_blobGlow01.dds and b/Distribution/Restock/GameData/ReStock/FX/fx_blobGlow01.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-1.dds b/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-1.dds index cf8562f5..c79acf10 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-1.dds and b/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-clean-1.dds b/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-clean-1.dds index 99fc0da5..a4891e50 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-clean-1.dds and b/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-clean-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-sharp-1.dds b/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-sharp-1.dds index 10b42a90..6ae95a03 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-sharp-1.dds and b/Distribution/Restock/GameData/ReStock/FX/restock-particle-blob-sharp-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-1.dds b/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-1.dds index ee6e5d31..fe7e8a3b 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-1.dds and b/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-2.dds b/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-2.dds index ffd94003..4f7db4f2 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-2.dds and b/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-flipbrook-1.dds b/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-flipbrook-1.dds index 43eb287e..520bdc08 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-flipbrook-1.dds and b/Distribution/Restock/GameData/ReStock/FX/restock-particle-flame-flipbrook-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-1.dds b/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-1.dds index 9b6f2dea..b50507c3 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-1.dds and b/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-2.dds b/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-2.dds index a8e7d11b..8882f423 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-2.dds and b/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-cored-1.dds b/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-cored-1.dds index 3255708c..760137ee 100644 Binary files a/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-cored-1.dds and b/Distribution/Restock/GameData/ReStock/FX/restock-particle-ring-cored-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg b/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg index 703c024c..9517b026 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg @@ -185,7 +185,6 @@ // RV-1X RCS Thruster Block @PART[RCSblock_01_small]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] { - @author = Chris Adderley (Nertea) !mesh = DELETE !MODEL {} @@ -558,6 +557,38 @@ key = 0 1 } } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = Bare + useMultipleDragCubes = true + VARIANT + { + name = Bare + displayName = #autoLOC_8007115 + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + MiniRCSBlock1 = true + MiniRCSBlock2 = false + } + } + VARIANT + { + name = Shroud + displayName = #autoLOC_8007114 + primaryColor = #999999 + secondaryColor = #999999 + GAMEOBJECTS + { + MiniRCSBlock1 = false + MiniRCSBlock2 = true + + } + } + } @MODULE[ModuleRCSFX] { @thrusterTransformName = RCSthruster diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg index 20fc53d5..a164ff1f 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg @@ -128,6 +128,128 @@ } } +// Illuminator Mk1 V2 +@PART[spotLight1_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-light-spot-2 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + @MODULE[ModuleLight] + { + @lightMeshRendererName = SpotLightLens + @lightName = Spot + movementTransformName = SpotLightBase + canRotate = false + canPitch = true + pitchAxisName = X + pitchMin = 0 + pitchMax = 180 + } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = Dark + + VARIANT + { + name = Dark + displayName #autoLOC_8007117 + themeName = Dark + primaryColor = #000000 + secondaryColor = #000000 + TEXTURE + { + materialName = restock-lights-1 + mainTextureURL = ReStock/Assets/Electrical/restock-lights-1 + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + materialName = restock-lights-1 + mainTextureURL = ReStock/Assets/Electrical/restock-lights-1-alt + } + } + } +} + +// Illuminator Mk2 V2 +@PART[spotLight2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-light-flood-2 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + @MODULE[ModuleLight] + { + @lightMeshRendererName = FloodLightLens + @lightName = Spot + movementTransformName = FloodR + canRotate = false + canPitch = true + pitchAxisName = X + pitchMin = 0 + pitchMin = 0 + pitchMax = 180 + } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = Dark + + VARIANT + { + name = Dark + displayName #autoLOC_8007117 + themeName = Dark + primaryColor = #000000 + secondaryColor = #000000 + TEXTURE + { + materialName = restock-lights-1 + mainTextureURL = ReStock/Assets/Electrical/restock-lights-1 + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + materialName = restock-lights-1 + mainTextureURL = ReStock/Assets/Electrical/restock-lights-1-alt + } + } + } +} + + // [1.11] Dome Light @PART[domeLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] { diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg index 25a32244..6140dc31 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg @@ -116,6 +116,16 @@ scale = 1,1,1 rotation = 0, 0, 0 } + MODULE + { + name = ModuleRestockDeployableMeshHider + transformName = Panels + transformName = PanelTruss + } + @MODULE[ModuleDeployableSolarPanel] + { + @breakName = pivotBase + } } // OX-STAT Photovoltaic Panels diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 6fb2c168..159f852d 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -160,6 +160,8 @@ Squad/Parts/Utility/ServiceBay_v2/ Squad/Parts/Utility/smallClaw/ Squad/Parts/Utility/spotLightMk1/ Squad/Parts/Utility/spotLightMk2/ +Squad/Parts/Utility/spotLightMk1_v2/ +Squad/Parts/Utility/spotLightMk2_v2/ Squad/Parts/Utility/stackCouplers/ Squad/Parts/Wheel/roverWheelM1/ Squad/Parts/Wheel/roverWheelS2/ diff --git a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version index 1188466e..b7105fd1 100644 --- a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version +++ b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version @@ -6,18 +6,18 @@ { "MAJOR":1, "MINOR":3, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION": { "MAJOR":1, "MINOR":11, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":10, + "MINOR":11, "PATCH":1 }, "KSP_VERSION_MAX":{ diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 4b0f4dd4..bd5db3c7 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -1,3 +1,13 @@ +v1.3.1 +------ +- Fixed small linear RCS collider +- Fixed Gigantor not being repairable +- Fixed compatability marked for 1.10.1, it isn't, really +- Change DXT5 textures to DXT1 where an alpha channel was unnecessary +- Applied Restock models to new Squad revamped Mk1, Mk2 Illuminators +- Added obese variant to small linear RCS to align with Squad's vision for the part +- Gigantor now breaks more correctly but still badly + v1.3.0 ------ - 1.11.0 diff --git a/Distribution/Restock/readme.txt b/Distribution/Restock/readme.txt index 50c1e4c3..120c4a1d 100644 --- a/Distribution/Restock/readme.txt +++ b/Distribution/Restock/readme.txt @@ -1,5 +1,5 @@ ============= -RESTOCK 1.3.0 +RESTOCK 1.3.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/RestockExtras/RestockRigidLegs/readme.txt b/Distribution/RestockExtras/RestockRigidLegs/readme.txt index 66a85054..20975804 100644 --- a/Distribution/RestockExtras/RestockRigidLegs/readme.txt +++ b/Distribution/RestockExtras/RestockRigidLegs/readme.txt @@ -10,7 +10,7 @@ DEPENDENCIES Required: - Restock (1.2.0) -- ModuleManager (4.1.3) +- ModuleManager (4.1.4) ============ INSTALLATION @@ -28,7 +28,7 @@ To install, drag the RestockRigidLegs folder and ModuleManager DLL from the Game - Parts - Resources - etc. - - ModuleManager.4.1.3.dll + - ModuleManager.4.1.4.dll ============ LOCALIZATION diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-basic-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-basic-1.dds index 2ab5277b..29ba4a58 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-basic-1.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-basic-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-methalox-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-methalox-1.dds index cfcb0991..6aee9d55 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-methalox-1.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-methalox-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-purple-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-purple-1.dds index 6b273540..96a7e3b1 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-purple-1.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-purple-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/FX/fx_blob04.dds b/Distribution/RestockPlus/GameData/ReStockPlus/FX/fx_blob04.dds index 864952af..dfb9b3dc 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/FX/fx_blob04.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/FX/fx_blob04.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-blob-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-blob-1.dds index ebe51394..563423f8 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-blob-1.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-blob-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-blob-sharp-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-blob-sharp-1.dds index 10b42a90..6ae95a03 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-blob-sharp-1.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-blob-sharp-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-flame-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-flame-1.dds index a47fe934..aa4cd031 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-flame-1.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-flame-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-1.dds index 9b6f2dea..b50507c3 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-1.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-2.dds b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-2.dds index a8e7d11b..8882f423 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-2.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-2.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-cored-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-cored-1.dds index 3255708c..760137ee 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-cored-1.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/FX/restock-particle-ring-cored-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/fr-fr.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/fr-fr.cfg index 87619116..b59b74ab 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/fr-fr.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/fr-fr.cfg @@ -93,10 +93,14 @@ Localization #LOC_RestockPlus_restock-engine-srb-mallet_description = Production interrompue suite à un manque de composants. Le petit maillet répond à la demande d'un booster à poudre miniature utilisable comme booster auxiliaire additionnel ou étage inférieur pour des petits lanceurs. Le concierge du personnel du CSK, un certain O. Trag Kerman, a même proposé d'en atacher des dizaines entre eux pour faire des vehicules super pas chers! #LOC_RestockPlus_restock-engine-srb-mallet_tags = (plus propulseur fusée solide éap eap restock maillet - #LOC_RestockPlus_restock-engine-srb-striker_title = Propulseur à ergol solide RT-2 'Attaquant' //j'ai hesité avec grêviste, mais il faut savoir etre raisonnable :) + #LOC_RestockPlus_restock-engine-srb-striker_title = Propulseur à ergol solide RT-2 'Attaquant' //j'ai hesité avec grêviste, mais il faut savoir être raisonnable :) #LOC_RestockPlus_restock-engine-srb-striker_description = Production interompue suite à un manque de composants. Étendre le maillet avec des segments additionnels peut fournir plus de booms que votre équipe d'intégration ne peut gérer! #LOC_RestockPlus_restock-engine-srb-striker_tags = (plus propulseur fusée solide éap eap restock striker attaquant + #LOC_RestockPlus_restock-engine-les-2_title = Tour de sauvetage Jr. + #LOC_RestockPlus_restock-engine-les-2_description = Une tour à ergol solide plus petite pour projeter l'équipage loin d'une mort certaine. + #LOC_RestockPlus_restock-engine-les-2_tags = annuler booster urgence explo ?les l.e.s panne défaillance ?rud secur solide survivre restock junior 625 + // Radial #LOC_RestockPlus_restock-engine-panda_title = Propulseur Vernier RK-1 'Raton laveur' #LOC_RestockPlus_restock-engine-panda_description = Ce petit propulseur a un très grand cardan dans un seul axe qui permet un excellent contrôle à tous les régimes de vol. diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-mini-2.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-mini-2.cfg index 0c387151..44703fa8 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-mini-2.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-mini-2.cfg @@ -85,7 +85,7 @@ PART { name = ModuleRCSFX thrusterTransformName = RCSthruster - thrusterPower = 1 + thrusterPower = .1 stagingEnabled = False resourceFlowMode = STAGE_PRIORITY_FLOW resourceName = MonoPropellant diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version index 435ea8a8..20e8bb5e 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version @@ -6,18 +6,18 @@ { "MAJOR":1, "MINOR":3, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION": { "MAJOR":1, "MINOR":11, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":10, + "MINOR":11, "PATCH":1 }, "KSP_VERSION_MAX":{ diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 5e607616..a0193de1 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -1,3 +1,11 @@ +v1.3.1 +------ +- Updated French localization (vinix38) +- Fixed compatability marked for 1.10.1, it isn't, really +- Change DXT5 textures to DXT1 where an alpha channel was unnecessary +- Fixed RV-1X-A thrust power +- Fixed RV-105-A depth mask + v1.3.0 ------ - KSP 1.11 diff --git a/Distribution/RestockPlus/readme.txt b/Distribution/RestockPlus/readme.txt index 48a05c7f..2d44e326 100644 --- a/Distribution/RestockPlus/readme.txt +++ b/Distribution/RestockPlus/readme.txt @@ -1,5 +1,5 @@ ============== -RESTOCK+ 1.3.0 +RESTOCK+ 1.3.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: @@ -21,7 +21,7 @@ DEPENDENCIES ============ Required: -- Restock (1.3.0) +- Restock (1.3.1) - ModuleManager (4.1.4) ============= diff --git a/README.md b/README.md index d3d6f4ca..de84c77e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Restock [![Build Status](https://travis-ci.com/PorktoberRevolution/ReStocked.svg?branch=prod)](https://travis-ci.com/PorktoberRevolution/ReStocked) +# Restock It's no secret that some of KSP's artwork is not great. Placeholder art made by a number of amateur artists throughout the game's development has resulted in a scattered mess of styles and qualities which is most evident in the part artwork.