Conflict Resolve

2025-12-11 08:43:04 +00:00 · 2017-12-24 16:54:59 +00:00
parent 59a31cbb9f
commit 3bc828140a
3 changed files with 9 additions and 4 deletions
--- a/dist/index.js
+++ b/dist/index.js
@@ -2760,8 +2760,8 @@ module.exports = {
        speed: 179,
        boost: 219,
        boostEnergy: 19,
-        baseShieldStrength: 99,
-        baseArmour: 1044,
+        baseShieldStrength: 320,
+        baseArmour: 580,
        hardness: 75,
        hullMass: 1200,
        masslock: 26,