Merge branch 'release/2.9.14'

2.9.14
Merge branch 'develop'
2025-12-08 23:23:23 +00:00 · 2018-05-29 07:04:11 +10:00 · 2018-05-29 07:04:02 +10:00 · 2018-05-12 19:19:26 +10:00 · 2018-05-06 09:10:34 +10:00 · 2018-05-06 09:00:33 +10:00
6 changed files with 2612 additions and 2294 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/modules.json
+++ b/modifications/modules.json
@@ -1740,6 +1740,11 @@
              "Colonel Bris Dekker",
              "Tiana Fortune"
            ]
+          },
+          "4": {
+            "engineers": [
+              "Colonel Bris Dekker"
+            ]
          }
        }
      }
@@ -3724,6 +3729,7 @@
      "special_dispersal_field",
      "special_phasing_sequence",
      "special_plasma_slug",
+      "special_plasma_slug_cooled",
      "special_lock_breaker",
      "special_thermal_conduit",
      "special_weapon_damage",
@@ -3945,6 +3951,16 @@
              "Marco Qwent",
              "The Dweller"
            ]
+          },
+          "4": {
+            "engineers": [
+              "The Dweller"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "The Dweller"
+            ]
          }
        }
      },
@@ -4040,6 +4056,16 @@
              "Marco Qwent",
              "The Dweller"
            ]
+          },
+          "4": {
+            "engineers": [
+              "The Dweller"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "The Dweller"
+            ]
          }
        }
      },
@@ -4065,6 +4091,16 @@
              "Marco Qwent",
              "The Dweller"
            ]
+          },
+          "4": {
+            "engineers": [
+              "The Dweller"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "The Dweller"
+            ]
          }
        }
      }
@@ -4546,6 +4582,17 @@
              "Hera Tani",
              "Marco Qwent"
            ]
+          },
+          "4": {
+            "engineers": [
+              "Hera Tani",
+              "Marco Qwent"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "Hera Tani"
+            ]
          }
        }
      },
@@ -5337,6 +5384,7 @@
      "kinres",
      "mass",
      "power",
+      "optmul",
      "shieldboost",
      "thermres"
    ],
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.12",
+  "version": "2.9.14",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.12",
+  "version": "2.9.14",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
Author	SHA1	Message	Date
willyb321	be3229a57d	Merge branch 'release/2.9.14'	2018-05-29 07:04:11 +10:00
willyb321	84c2a2ad30	2.9.14	2018-05-29 07:04:02 +10:00
willyb321	5e24df467a	Merge branch 'develop'	2018-05-12 19:19:26 +10:00
willyb321	1a478758ee	fix pa plasma slug missing	2018-05-06 09:10:34 +10:00
willyb321	b58cb71e5a	Fix PD ammo cap crashing Fixes EDCD/coriolis#272	2018-05-06 09:00:33 +10:00
willyb321	652decf6b3	Merge branch 'develop'	2018-05-04 16:22:40 +10:00
willyb321	6b13b3a673	fix chaff ammo cap crashing	2018-05-04 16:21:42 +10:00
willyb321	a667fd2309	Merge remote-tracking branch 'origin/develop'	2018-05-03 10:59:27 +10:00
William Blythe	cff8cf71df	fix heat sink Closes #266	2018-05-03 10:49:58 +10:00
willyb321	e8c1ae4c89	Merge branch 'release/2.9.13'	2018-05-03 07:15:42 +10:00
willyb321	e7bcba7360	Merge branch 'release/2.9.13' into develop	2018-05-03 07:15:41 +10:00
willyb321	68682f062c	2.9.13	2018-05-03 07:15:35 +10:00
willyb321	c81e4fd554	dist	2018-05-03 07:13:35 +10:00
willyb321	ae744982c6	add LE g4,5	2018-05-03 07:12:36 +10:00
William Blythe	e7a8c2eeb9	pd, interdictor also sb	2018-04-30 10:58:09 +10:00
William Blythe	90035fc057	dist	2018-04-30 10:24:15 +10:00
William	c67fcc6497	Merge pull request #30 from UrukCan/patch-3 last blueprints	2018-04-30 10:18:34 +10:00
UrukCan	2f3410c462	last blueprints AFMU Cargo/Kill/Manifest scanner Chaff ECM FSD interdictor Heat Sink PDT Collector/Fuel/Hatch/Prospector Limpet Fuel Scoop Life Support Refinery SCB Weapon_DoubleShot Weapon_HighCapacity Weapon_RapidFire fixed spme PP values (in short, everything that was missing except heavy duty shield boosters)	2018-04-30 02:16:55 +02:00
willyb321	d9729fa252	Merge branch 'release/2.9.12' into develop	2018-04-28 12:15:31 +10:00