Merge remote-tracking branch 'origin/master' into develop

2024-09-01 17:34:42 +00:00 · 2020-09-21 18:51:29 -07:00
parent a57ed98c17 492753dce4
commit fcd24b7c5c
118 changed files with 2763 additions and 629 deletions
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
@ -146,7 +146,7 @@ PART
    {
      key = 0 295
      key = 1 275
-      key = 12 100
+      key = 12 0.001
    }
  }
  MODULE