Merge branch 'release/2.9.12'

Merge branch 'develop'
Merge branch 'release/2.9.11'
2025-12-09 15:35:35 +00:00 · 2018-04-28 12:15:32 +10:00 · 2018-04-28 09:57:05 +10:00 · 2018-04-26 09:20:42 +10:00
7 changed files with 2310 additions and 2628 deletions
--- a/dist/index.js
+++ b/dist/index.js
--- a/dist/index.json
+++ b/dist/index.json
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
--- a/modifications/modifierActions.json
+++ b/modifications/modifierActions.json
@@ -400,7 +400,7 @@
  },
  "special_weapon_rateoffire": {
    "power": 0.05,
-    "rof": -0.03
+    "rof": 0.03
  },
  "special_weapon_efficient": {
    "power": -0.1
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -1740,11 +1740,6 @@
              "Colonel Bris Dekker",
              "Tiana Fortune"
            ]
-          },
-          "4": {
-            "engineers": [
-              "Colonel Bris Dekker"
-            ]
          }
        }
      }
@@ -3729,7 +3724,6 @@
      "special_dispersal_field",
      "special_phasing_sequence",
      "special_plasma_slug",
-      "special_plasma_slug_cooled",
      "special_lock_breaker",
      "special_thermal_conduit",
      "special_weapon_damage",
@@ -3951,16 +3945,6 @@
              "Marco Qwent",
              "The Dweller"
            ]
-          },
-          "4": {
-            "engineers": [
-              "The Dweller"
-            ]
-          },
-          "5": {
-            "engineers": [
-              "The Dweller"
-            ]
          }
        }
      },
@@ -4056,16 +4040,6 @@
              "Marco Qwent",
              "The Dweller"
            ]
-          },
-          "4": {
-            "engineers": [
-              "The Dweller"
-            ]
-          },
-          "5": {
-            "engineers": [
-              "The Dweller"
-            ]
          }
        }
      },
@@ -4091,16 +4065,6 @@
              "Marco Qwent",
              "The Dweller"
            ]
-          },
-          "4": {
-            "engineers": [
-              "The Dweller"
-            ]
-          },
-          "5": {
-            "engineers": [
-              "The Dweller"
-            ]
          }
        }
      }
@@ -4582,17 +4546,6 @@
              "Hera Tani",
              "Marco Qwent"
            ]
-          },
-          "4": {
-            "engineers": [
-              "Hera Tani",
-              "Marco Qwent"
-            ]
-          },
-          "5": {
-            "engineers": [
-              "Hera Tani"
-            ]
          }
        }
      },
@@ -5384,7 +5337,6 @@
      "kinres",
      "mass",
      "power",
-      "optmul",
      "shieldboost",
      "thermres"
    ],
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.16",
+  "version": "2.9.12",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.16",
+  "version": "2.9.12",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
Author	SHA1	Message	Date
willyb321	6d8c74ad3f	Merge branch 'release/2.9.12'	2018-04-28 12:15:32 +10:00
willyb321	c140856334	Merge branch 'develop'	2018-04-28 09:57:05 +10:00
willyb321	9ac6427ee0	Merge branch 'release/2.9.11'	2018-04-26 09:20:42 +10:00