Merge pull request #1 from cmmcleod/master

If I'm doing this right, this will take updates to my fork

app/less/shipyard.less

@@ -20,6 +20,7 @@ a.ship {
     width: 100%;
     margin: 0;
     text-align: left;
+    font-size: 1.1em;
   }
 
   small {

data/components/bulkheads.json

@@ -73,6 +73,43 @@
       "mass": 26
     }
   ],
+  "diamondback_explorer": [
+    {
+      "name": "Lightweight Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 0,
+      "mass": 0
+    },
+    {
+      "name": "Reinforced Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 800000,
+      "mass": 23
+    },
+    {
+      "name": "Military Grade Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 1800000,
+      "mass": 47
+    },
+    {
+      "name": "Mirrored Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 4200000,
+      "mass": 26
+    },
+    {
+      "name": "Reactive Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 4714000,
+      "mass": 47
+    }
+  ],
   "imperial_courier": [
     {
       "name": "Lightweight Alloy",

data/ships/diamondback_explorer.json

@@ -0,0 +1,72 @@
+{
+  "diamondback_explorer": {
+    "properties": {
+      "grp": "ex",
+      "name": "Diamondback Explorer",
+      "manufacturer": "Lakon",
+      "class": 1,
+      "cost": 2000000,
+      "speed": 242,
+      "boost": 316,
+      "agility": 5,
+      "shields": 115,
+      "armour": 270,
+      "fuelcost": 50,
+      "mass": 298
+    },
+    "slots": {
+      "common": [
+        4,
+        4,
+        5,
+        3,
+        4,
+        3,
+        5
+      ],
+      "hardpoints": [
+        3,
+        2,
+        2,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        4,
+        4,
+        3,
+        3,
+        2
+      ]
+    },
+    "defaults": {
+      "common": [
+        "4E",
+        "4E",
+        "5E",
+        "3E",
+        "4E",
+        "3E",
+        "5C"
+      ],
+      "hardpoints": [
+        0,
+        17,
+        17,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        "49",
+        "02",
+        "01",
+        0,
+        "2h"
+      ]
+    }
+  }
+}

data/ships/type_7_transport.json

@@ -2,7 +2,7 @@
   "type_7_transport": {
     "properties": {
       "grp": "fr",
-      "name": "Type-7 Transport",
+      "name": "Type-7 Transporter",
       "manufacturer": "Lakon",
       "class": 3,
       "cost": 16881511,
@@ -77,4 +77,4 @@
       ]
     }
   }
-}
+}

gulpfile.js

@@ -158,6 +158,17 @@ gulp.task('serve', function(cb) {
   });
 });
 
+// Windows command to launch nginx serv
+gulp.task('serve-win', function(cb) {
+  exec('nginx -p %cd% -c nginx.conf', function (err, stdout, stderr) {
+    if (stderr) {
+      console.warn(stderr);
+      console.warn('Is NGINX already running?\n');
+    }
+    cb();
+  });
+});
+
 gulp.task('serve-stop', function(cb) {
   exec('kill -QUIT $(cat nginx.pid)', function (err, stdout, stderr) {
     if (stderr) console.log(stderr); else cb(err);