Merge branch 'develop' into features/r2_11_2_alphafold/JAL-2349_JAL-3855
authorJim Procter <j.procter@dundee.ac.uk>
Wed, 16 Feb 2022 13:27:25 +0000 (13:27 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Wed, 16 Feb 2022 13:27:25 +0000 (13:27 +0000)
commit8286731258d314669ee6facb627947fe159ac1eb
treefc6b0dadb3d863b2e75ab71b808161d9562c9994
parentb5ea0bbb85bef19c50fb4341bda9e9da9ef09b13
parentf9062df1303c1ff071075256cf4b7ad7c9db9658
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-2349_JAL-3855
combined new logic for 2.11.2 3d-beacons with original hack to resolve PAE and CIF
 Conflicts:
src/jalview/ws/dbsources/EBIAlfaFold.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/ws/SequenceFetcher.java
src/jalview/ws/dbsources/EBIAlfaFold.java
test/jalview/ws/seqfetcher/DbRefFetcherTest.java