Skip to content

Commit

Permalink
Merge branch 'v2_updates' of github.com:massif-press/lancer-data into…
Browse files Browse the repository at this point in the history
… v2_updates
  • Loading branch information
jarena-qsr committed Jan 14, 2020
2 parents ac5c056 + c6fae1c commit dea8137
Show file tree
Hide file tree
Showing 12 changed files with 3,653 additions and 4,626 deletions.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const data = {
reserves: require('./lib/reserves.json'),
npc_classes: require('./lib/npc_classes_v2.json'),
npc_features: require('./lib/npc_features_v2.json'),
npc_templates: require('./lib/npc_templatesv2.json'),
npc_templates: require('./lib/npc_templates_v2.json'),
// npc_generic_systems: require('./lib/npc_generic_systems.json'),
// npc_template_systems: require('./lib/npc_template_systems.json'),
}
Expand Down
249 changes: 125 additions & 124 deletions lib/core_bonuses.json

Large diffs are not rendered by default.

1,445 changes: 653 additions & 792 deletions lib/frames.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/info.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "LANCER Core",
"author": "Massif Press",
"version": "Prerelease v2.0",
"version": "November 2019 Release",
"description": "The official base game",
"website": "https://massif-press.itch.io/lancer-core-book",
"active": true
Expand Down
42 changes: 21 additions & 21 deletions lib/manufacturers.json

Large diffs are not rendered by default.

280 changes: 183 additions & 97 deletions lib/mods.json

Large diffs are not rendered by default.

Loading

0 comments on commit dea8137

Please sign in to comment.