Merge branch 'develop'

src/app/components/AvailableModulesMenu.jsx

@@ -58,12 +58,14 @@ const GRPCAT = {
   'po': 'defence',
   'ec': 'defence',
   'sfn': 'defence',
-  // Standard
+  // Guardian
   'gpp': 'guardian',
   'gpc': 'guardian',
   'gsrp': 'guardian',
   'ggc': 'guardian',
-  'gfsb': 'guardian'
+  'gfsb': 'guardian',
+  'gmrp': 'guardian',
+  'ghrp': 'guardian'
 };
 // Order here is the order in which items will be shown in the modules menu
 const CATEGORIES = {
@@ -92,7 +94,7 @@ const CATEGORIES = {
   'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn', 'rcpl'],
 
   // Guardian
-  'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb']
+  'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp']
 };
 
 /**

src/app/i18n/en.json

@@ -126,6 +126,8 @@
     "ggc": "Guardian Gauss Cannon",
     "gsrp": "Guardian Shield Reinforcement Package",
     "gfsb": "Guardian Frame Shift Drive Booster",
+    "ghrp": "Guardian Hull Reinforcement Package",
+    "gmrp": "Guardian Module Reinforcement Package",
     "psg": "Prismatic Shield Generator",
     "pv": "Planetary Vehicle Hangar",
     "rf": "Refinery",

src/app/shipyard/Constants.js

@@ -54,6 +54,8 @@ export const ModuleGroupToName = {
   ss: 'Surface Scanner',
   gsrp: 'Guardian Shield Reinforcement Packages',
   gfsb: 'Guardian Frame Shift Drive Booster',
+  ghrp: 'Guardian Hull Reinforcement Package',
+  gmrp: 'Guardian Module Reinforcement Package',
 
   // Hard Points
   bl: 'Beam Laser',