Merge branch 'master' into develop

This commit is contained in:
willyb321
2018-09-23 11:28:20 +10:00
17 changed files with 85 additions and 31 deletions

View File

@@ -33,8 +33,8 @@
"standard": [3, 3, 3, 1, 2, 2, 2],
"hardpoints": [2, 1, 1, 0],
"internal": [
3, 2,
{ "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
3, 2,
{ "class": 2, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
1, 1
]
},