mirror of
https://github.com/EDCD/coriolis-data.git
synced 2025-12-09 15:35:35 +00:00
Fix merge issues
This commit is contained in:
638
dist/index.js
vendored
638
dist/index.js
vendored
File diff suppressed because it is too large
Load Diff
638
dist/index.json
vendored
638
dist/index.json
vendored
File diff suppressed because it is too large
Load Diff
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"cr": [
|
||||
{ "id": "00", "edID": 128064338, "eddbID": 1191, "grp": "cr", "class": 1, "rating": "E", "cost": 1000, "capacity": 2 },
|
||||
{ "id": "01", "edID": 128064339, "eddbID": 1192, "grp": "cr", "class": 2, "rating": "E", "cost": 3250, "capacity": 4 },
|
||||
{ "id": "02", "edID": 128064340, "eddbID": 1193, "grp": "cr", "class": 3, "rating": "E", "cost": 10560, "capacity": 8 },
|
||||
{ "id": "03", "edID": 128064341, "eddbID": 1194, "grp": "cr", "class": 4, "rating": "E", "cost": 34330, "capacity": 16 },
|
||||
{ "id": "04", "edID": 128064342, "eddbID": 1195, "grp": "cr", "class": 5, "rating": "E", "cost": 111570, "capacity": 32 },
|
||||
{ "id": "05", "edID": 128064343, "eddbID": 1196, "grp": "cr", "class": 6, "rating": "E", "cost": 362590, "capacity": 64 },
|
||||
{ "id": "06", "edID": 128064344, "eddbID": 1197, "grp": "cr", "class": 7, "rating": "E", "cost": 1178420, "capacity": 128 },
|
||||
{ "id": "07", "edID": 128064345, "eddbID": 1198, "grp": "cr", "class": 8, "rating": "E", "cost": 3829870, "capacity": 256 }
|
||||
{ "id": "00", "edID": 128064338, "eddbID": 1191, "grp": "cr", "class": 1, "rating": "E", "cost": 1000, "cargo": 2 },
|
||||
{ "id": "01", "edID": 128064339, "eddbID": 1192, "grp": "cr", "class": 2, "rating": "E", "cost": 3250, "cargo": 4 },
|
||||
{ "id": "02", "edID": 128064340, "eddbID": 1193, "grp": "cr", "class": 3, "rating": "E", "cost": 10560, "cargo": 8 },
|
||||
{ "id": "03", "edID": 128064341, "eddbID": 1194, "grp": "cr", "class": 4, "rating": "E", "cost": 34330, "cargo": 16 },
|
||||
{ "id": "04", "edID": 128064342, "eddbID": 1195, "grp": "cr", "class": 5, "rating": "E", "cost": 111570, "cargo": 32 },
|
||||
{ "id": "05", "edID": 128064343, "eddbID": 1196, "grp": "cr", "class": 6, "rating": "E", "cost": 362590, "cargo": 64 },
|
||||
{ "id": "06", "edID": 128064344, "eddbID": 1197, "grp": "cr", "class": 7, "rating": "E", "cost": 1178420, "cargo": 128 },
|
||||
{ "id": "07", "edID": 128064345, "eddbID": 1198, "grp": "cr", "class": 8, "rating": "E", "cost": 3829870, "cargo": 256 }
|
||||
]
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"ft": [
|
||||
{ "id": "f1", "edID": 128064346, "eddbID": 1199, "grp": "ft", "class": 1, "rating": "C", "cost": 1000, "capacity": 2 },
|
||||
{ "id": "f2", "edID": 128064347, "eddbID": 1200, "grp": "ft", "class": 2, "rating": "C", "cost": 3750, "capacity": 4 },
|
||||
{ "id": "f3", "edID": 128064348, "eddbID": 1201, "grp": "ft", "class": 3, "rating": "C", "cost": 7060, "capacity": 8 },
|
||||
{ "id": "f4", "edID": 128064349, "eddbID": 1202, "grp": "ft", "class": 4, "rating": "C", "cost": 24730, "capacity": 16 },
|
||||
{ "id": "f5", "edID": 128064350, "eddbID": 1203, "grp": "ft", "class": 5, "rating": "C", "cost": 97750, "capacity": 32 },
|
||||
{ "id": "f6", "edID": 128064351, "eddbID": 1204, "grp": "ft", "class": 6, "rating": "C", "cost": 341580, "capacity": 64 },
|
||||
{ "id": "f7", "edID": 128064352, "eddbID": 1205, "grp": "ft", "class": 7, "rating": "C", "cost": 1780910, "capacity": 128 },
|
||||
{ "id": "f8", "edID": 128064353, "eddbID": 1206, "grp": "ft", "class": 8, "rating": "C", "cost": 5428400, "capacity": 256 }
|
||||
{ "id": "f1", "edID": 128064346, "eddbID": 1199, "grp": "ft", "class": 1, "rating": "C", "cost": 1000, "fuel": 2 },
|
||||
{ "id": "f2", "edID": 128064347, "eddbID": 1200, "grp": "ft", "class": 2, "rating": "C", "cost": 3750, "fuel": 4 },
|
||||
{ "id": "f3", "edID": 128064348, "eddbID": 1201, "grp": "ft", "class": 3, "rating": "C", "cost": 7060, "fuel": 8 },
|
||||
{ "id": "f4", "edID": 128064349, "eddbID": 1202, "grp": "ft", "class": 4, "rating": "C", "cost": 24730, "fuel": 16 },
|
||||
{ "id": "f5", "edID": 128064350, "eddbID": 1203, "grp": "ft", "class": 5, "rating": "C", "cost": 97750, "fuel": 32 },
|
||||
{ "id": "f6", "edID": 128064351, "eddbID": 1204, "grp": "ft", "class": 6, "rating": "C", "cost": 341580, "fuel": 64 },
|
||||
{ "id": "f7", "edID": 128064352, "eddbID": 1205, "grp": "ft", "class": 7, "rating": "C", "cost": 1780910, "fuel": 128 },
|
||||
{ "id": "f8", "edID": 128064353, "eddbID": 1206, "grp": "ft", "class": 8, "rating": "C", "cost": 5428400, "fuel": 256 }
|
||||
]
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"1C": { "id":"f1", "edID": 128064346, "eddbID": 1199, "grp": "ft", "class": 1, "rating": "C", "cost": 1000, "capacity": 2 },
|
||||
"2C": { "id":"f2", "edID": 128064347, "eddbID": 1200, "grp": "ft", "class": 2, "rating": "C", "cost": 3750, "capacity": 4 },
|
||||
"3C": { "id":"f3", "edID": 128064348, "eddbID": 1201, "grp": "ft", "class": 3, "rating": "C", "cost": 7060, "capacity": 8 },
|
||||
"4C": { "id":"f4", "edID": 128064349, "eddbID": 1202, "grp": "ft", "class": 4, "rating": "C", "cost": 24730, "capacity": 16 },
|
||||
"5C": { "id":"f5", "edID": 128064350, "eddbID": 1203, "grp": "ft", "class": 5, "rating": "C", "cost": 97750, "capacity": 32 },
|
||||
"6C": { "id":"f6", "edID": 128064351, "eddbID": 1204, "grp": "ft", "class": 6, "rating": "C", "cost": 341580, "capacity": 64 },
|
||||
"7C": { "id":"f7", "edID": 128064352, "eddbID": 1205, "grp": "ft", "class": 7, "rating": "C", "cost": 1780910, "capacity": 128 },
|
||||
"8C": { "id":"f8", "edID": 128064353, "eddbID": 1206, "grp": "ft", "class": 8, "rating": "C", "cost": 5428400, "capacity": 256 }
|
||||
"1C": { "id":"f1", "edID": 128064346, "eddbID": 1199, "grp": "ft", "class": 1, "rating": "C", "cost": 1000, "fuel": 2 },
|
||||
"2C": { "id":"f2", "edID": 128064347, "eddbID": 1200, "grp": "ft", "class": 2, "rating": "C", "cost": 3750, "fuel": 4 },
|
||||
"3C": { "id":"f3", "edID": 128064348, "eddbID": 1201, "grp": "ft", "class": 3, "rating": "C", "cost": 7060, "fuel": 8 },
|
||||
"4C": { "id":"f4", "edID": 128064349, "eddbID": 1202, "grp": "ft", "class": 4, "rating": "C", "cost": 24730, "fuel": 16 },
|
||||
"5C": { "id":"f5", "edID": 128064350, "eddbID": 1203, "grp": "ft", "class": 5, "rating": "C", "cost": 97750, "fuel": 32 },
|
||||
"6C": { "id":"f6", "edID": 128064351, "eddbID": 1204, "grp": "ft", "class": 6, "rating": "C", "cost": 341580, "fuel": 64 },
|
||||
"7C": { "id":"f7", "edID": 128064352, "eddbID": 1205, "grp": "ft", "class": 7, "rating": "C", "cost": 1780910, "fuel": 128 },
|
||||
"8C": { "id":"f8", "edID": 128064353, "eddbID": 1206, "grp": "ft", "class": 8, "rating": "C", "cost": 5428400, "fuel": 256 }
|
||||
}
|
||||
Reference in New Issue
Block a user