Marcel 3182724b66 Merge branch 'aweinstock/add-models-20210603' into 'master' ...

Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.

See merge request veloren/veloren!2371

2021-06-06 16:56:21 +00:00

..

src

Merge branch 'aweinstock/add-models-20210603' into 'master'

2021-06-06 16:56:21 +00:00

Cargo.toml

Revert "Merge branch 'sharp/revert-quinn' into 'master'"

2021-05-21 10:41:16 +02:00