Colin McLeod 73472cf611 Fix merge issues

2016-02-12 15:55:39 -08:00

..

frame_shift_drive.json

Added Elite IDs for known modules

2016-02-12 22:57:26 +00:00

fuel_tank.json

Fix merge issues

2016-02-12 15:55:39 -08:00

life_support.json

Added Elite IDs for known modules

2016-02-12 22:57:26 +00:00

power_distributor.json

Added Elite IDs for known modules

2016-02-12 22:57:26 +00:00

power_plant.json

Added Elite IDs for known modules

2016-02-12 22:57:26 +00:00

sensors.json

Added Elite IDs for known modules

2016-02-12 22:57:26 +00:00

thrusters.json

Added Elite IDs for known modules

2016-02-12 22:57:26 +00:00