Merge branch 'release/2.9.15'

2.9.15
Merge branch 'release/2.9.14'
2025-12-08 15:13:23 +00:00 · 2018-05-30 07:44:12 +10:00 · 2018-05-30 07:44:07 +10:00 · 2018-05-29 07:04:11 +10:00 · 2018-05-29 07:04:11 +10:00 · 2018-05-29 07:04:02 +10:00
6 changed files with 14 additions and 12 deletions
--- a/dist/index.js
+++ b/dist/index.js
@@ -16834,7 +16834,7 @@ module.exports = {
      ChaffLauncher_ChaffCapacity: {
        fdname: "ChaffLauncher_ChaffCapacity",
        grades: {
-          "1": {
+          "3": {
            components: {
              "Mechanical Scrap": 1,
              Niobium: 1,
@@ -18336,7 +18336,7 @@ module.exports = {
      HeatSinkLauncher_HeatSinkCapacity: {
        fdname: "HeatSinkLauncher_HeatSinkCapacity",
        grades: {
-          "1": {
+          "3": {
            components: {
              "Mechanical Scrap": 1,
              Niobium: 1,
@@ -19349,7 +19349,7 @@ module.exports = {
      PointDefence_PointDefenseCapacity: {
        fdname: "PointDefence_PointDefenseCapacity",
        grades: {
-          "1": {
+          "3": {
            components: {
              "Mechanical Scrap": 1,
              Niobium: 1,
@@ -25826,7 +25826,7 @@ module.exports = {
          }
        },
        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
-        specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_lock_breaker", "special_thermal_conduit", "special_weapon_damage", "special_weapon_efficient", "special_weapon_rateoffire", "special_weapon_toughened", "special_weapon_lightweight" ]
+        specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_plasma_slug_cooled", "special_lock_breaker", "special_thermal_conduit", "special_weapon_damage", "special_weapon_efficient", "special_weapon_rateoffire", "special_weapon_toughened", "special_weapon_lightweight" ]
      },
      pas: {
        blueprints: {},
--- a/dist/index.json
+++ b/dist/index.json
@@ -19961,7 +19961,7 @@
 			"ChaffLauncher_ChaffCapacity": {
 				"fdname": "ChaffLauncher_ChaffCapacity",
 				"grades": {
-					"1": {
+					"3": {
 						"components": {
 							"Mechanical Scrap": 1,
 							"Niobium": 1,
@@ -22460,7 +22460,7 @@
 			"HeatSinkLauncher_HeatSinkCapacity": {
 				"fdname": "HeatSinkLauncher_HeatSinkCapacity",
 				"grades": {
-					"1": {
+					"3": {
 						"components": {
 							"Mechanical Scrap": 1,
 							"Niobium": 1,
@@ -24163,7 +24163,7 @@
 			"PointDefence_PointDefenseCapacity": {
 				"fdname": "PointDefence_PointDefenseCapacity",
 				"grades": {
-					"1": {
+					"3": {
 						"components": {
 							"Mechanical Scrap": 1,
 							"Niobium": 1,
@@ -35176,6 +35176,7 @@
 					"special_dispersal_field",
 					"special_phasing_sequence",
 					"special_plasma_slug",
+					"special_plasma_slug_cooled",
 					"special_lock_breaker",
 					"special_thermal_conduit",
 					"special_weapon_damage",
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -575,7 +575,7 @@
  "ChaffLauncher_ChaffCapacity": {
    "fdname": "ChaffLauncher_ChaffCapacity",
    "grades": {
-      "1": {
+      "3": {
        "components": {
          "Mechanical Scrap": 1,
          "Niobium": 1,
@@ -2077,7 +2077,7 @@
  "HeatSinkLauncher_HeatSinkCapacity": {
    "fdname": "HeatSinkLauncher_HeatSinkCapacity",
    "grades": {
-      "1": {
+      "3": {
        "components": {
          "Mechanical Scrap": 1,
          "Niobium": 1,
@@ -3090,7 +3090,7 @@
  "PointDefence_PointDefenseCapacity": {
    "fdname": "PointDefence_PointDefenseCapacity",
    "grades": {
-      "1": {
+      "3": {
        "components": {
          "Mechanical Scrap": 1,
          "Niobium": 1,
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -3729,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",
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.13",
+  "version": "2.9.15",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.9.13",
+  "version": "2.9.15",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
Author	SHA1	Message	Date
willyb321	355d14777d	Merge branch 'release/2.9.15'	2018-05-30 07:44:12 +10:00
willyb321	4254abcc15	2.9.15	2018-05-30 07:44:07 +10:00
willyb321	be3229a57d	Merge branch 'release/2.9.14'	2018-05-29 07:04:11 +10:00
willyb321	7260d2f75d	Merge branch 'release/2.9.14' into develop	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	e7bcba7360	Merge branch 'release/2.9.13' into develop	2018-05-03 07:15:41 +10:00