From a4b2c25cc56b5952b931a0899968a6e38debce8e Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Sun, 20 Oct 2019 15:56:54 -0700 Subject: [PATCH 1/3] Move license for plugin to Restock Base Move the LGPL license clause to the base restock folder, since that is where the DLL is distributed --- Distribution/Restock/license.txt | 6 ++++++ Distribution/RestockPlus/license.txt | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Distribution/Restock/license.txt b/Distribution/Restock/license.txt index 4a6867ec..e45ec971 100644 --- a/Distribution/Restock/license.txt +++ b/Distribution/Restock/license.txt @@ -14,3 +14,9 @@ Copyright (c) 2019 the ReStock team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +PLUGIN CODE +----------- + +Plugin code is distributed under the LGPL v3, as described in the license.txt file in the Source folder. diff --git a/Distribution/RestockPlus/license.txt b/Distribution/RestockPlus/license.txt index c4dca9b4..623df173 100644 --- a/Distribution/RestockPlus/license.txt +++ b/Distribution/RestockPlus/license.txt @@ -13,10 +13,4 @@ Configs are distributed under the MIT license Copyright (c) 2019 the ReStock team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -PLUGIN CODE ------------ - -Plugin code is distributed under the LGPL v3, as described in the license.txt file in the Source folder. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file From 59eda187fdd25dbced34f35b770bbf54678af659 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Sun, 20 Oct 2019 15:59:11 -0700 Subject: [PATCH 2/3] Fix scaling on medium and large rigid legs --- .../RestockRigidLegs/Parts/restock-leg-2-rigid.cfg | 2 +- .../RestockRigidLegs/Parts/restock-leg-3-rigid.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Distribution/RestockExtras/RestockRigidLegs/Parts/restock-leg-2-rigid.cfg b/Distribution/RestockExtras/RestockRigidLegs/Parts/restock-leg-2-rigid.cfg index 3a942565..0d455441 100644 --- a/Distribution/RestockExtras/RestockRigidLegs/Parts/restock-leg-2-rigid.cfg +++ b/Distribution/RestockExtras/RestockRigidLegs/Parts/restock-leg-2-rigid.cfg @@ -10,7 +10,7 @@ PART { model = ReStock/Assets/Ground/restock-leg-2-rigid } - rescaleFactor = 1.0 + rescaleFactor = 1.25 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision attachRules = 1,1,0,0,0 diff --git a/Distribution/RestockExtras/RestockRigidLegs/Parts/restock-leg-3-rigid.cfg b/Distribution/RestockExtras/RestockRigidLegs/Parts/restock-leg-3-rigid.cfg index 591a39ae..fac9d117 100644 --- a/Distribution/RestockExtras/RestockRigidLegs/Parts/restock-leg-3-rigid.cfg +++ b/Distribution/RestockExtras/RestockRigidLegs/Parts/restock-leg-3-rigid.cfg @@ -10,7 +10,7 @@ PART { model = ReStock/Assets/Ground/restock-leg-3-rigid } - rescaleFactor = 1.0 + rescaleFactor = 1.25 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision attachRules = 1,1,0,0,0 From 663f57b7e76cb200517dde327a7d0386252dfc75 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Sun, 20 Oct 2019 16:03:48 -0700 Subject: [PATCH 3/3] Fix attach node normal on .625m claw --- .../ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg index 08da389f..c1fb1676 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg @@ -15,7 +15,7 @@ PART // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision attachRules = 1,1,0,0,0 - node_attach = 0.0, -0.01, 0.0, 0.0, 1.0, 0.0, 0 + node_attach = 0.0, -0.01, 0.0, 0.0, -1.0, 0.0, 0 node_stack_bottom = 0.0, -0.06, 0.0, 0.0, -1.0, 0.0, 0 TechRequired = actuators