Merge commit '69b5202f' into ui-app
# Conflicts: # package-lock.json # package.json # src/apps/render-test/state.ts # src/apps/render-test/utils/index.ts # src/apps/render-test/utils/mcubes.ts # src/mol-model/structure/model/format.ts # src/mol-model/structure/model/formats/gro.ts
No related branches found
No related tags found
Showing
- data/mmcif-field-names.csv 4 additions, 0 deletionsdata/mmcif-field-names.csv
- package-lock.json 0 additions, 0 deletionspackage-lock.json
- src/apps/cif2bcif/converter.ts 1 addition, 2 deletionssrc/apps/cif2bcif/converter.ts
- src/apps/combine-mmcif/index.ts 2 additions, 2 deletionssrc/apps/combine-mmcif/index.ts
- src/apps/schema-generator/schema-from-mmcif-dic.ts 3 additions, 4 deletionssrc/apps/schema-generator/schema-from-mmcif-dic.ts
- src/apps/structure-info/helpers.ts 2 additions, 2 deletionssrc/apps/structure-info/helpers.ts
- src/apps/structure-info/model.ts 54 additions, 28 deletionssrc/apps/structure-info/model.ts
- src/apps/structure-info/volume.ts 2 additions, 3 deletionssrc/apps/structure-info/volume.ts
- src/examples/task.ts 8 additions, 8 deletionssrc/examples/task.ts
- src/mol-app/service/job.ts 2 additions, 2 deletionssrc/mol-app/service/job.ts
- src/mol-data/generic/unique-array.ts 2 additions, 1 deletionsrc/mol-data/generic/unique-array.ts
- src/mol-data/int/_spec/sorted-array.spec.ts 11 additions, 0 deletionssrc/mol-data/int/_spec/sorted-array.spec.ts
- src/mol-data/int/impl/sorted-array.ts 22 additions, 0 deletionssrc/mol-data/int/impl/sorted-array.ts
- src/mol-data/int/sorted-array.ts 6 additions, 0 deletionssrc/mol-data/int/sorted-array.ts
- src/mol-data/util/equivalence-classes.ts 4 additions, 3 deletionssrc/mol-data/util/equivalence-classes.ts
- src/mol-data/util/hash-functions.ts 8 additions, 0 deletionssrc/mol-data/util/hash-functions.ts
- src/mol-data/util/sort.ts 3 additions, 3 deletionssrc/mol-data/util/sort.ts
- src/mol-geo/representation/structure/index.ts 13 additions, 43 deletionssrc/mol-geo/representation/structure/index.ts
- src/mol-geo/representation/structure/point.ts 19 additions, 17 deletionssrc/mol-geo/representation/structure/point.ts
- src/mol-geo/representation/structure/spacefill.ts 15 additions, 16 deletionssrc/mol-geo/representation/structure/spacefill.ts
Loading
Please register or sign in to comment