mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-18 15:33:12 +09:00
Merge remote-tracking branch 'upstream/master' into feature/lenient-mod-version-parsing
# Conflicts: # packages/lib/src/data/version.ts
This commit is contained in:
commit
e27ad5fdf9
28 files changed
+414
-25
No files matched your search
@@ -278,7 +278,12 @@ export default class ModInfo {
|
||||
|
||||
static validate = libSchema.compile(this.jsonSchema as any);
|
||||
|
||||
static fromJSON(json: Static<typeof ModInfo.jsonSchema>) {
|
||||
// Accepts the lenient info.json version fields (normalised below) plus the stored
|
||||
// extras; the strict jsonSchema describes the serialised form produced by toJSON.
|
||||
static fromJSON(json:
|
||||
Static<typeof ModInfo.infoJsonSchema>
|
||||
& Pick<Static<typeof ModInfo.jsonSchema>, "size" | "mtime_ms" | "sha1" | "updated_at_ms" | "is_deleted">
|
||||
) {
|
||||
const modInfo = new this();
|
||||
|
||||
// info.json fields
|
||||
|
||||
Reference in new issue
Block a user