Marcel 521e1eacf3 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
..
kits.ron	Added kits for tiers 1 and 2	2021-06-03 21:39:17 -05:00
presets.ron	Fix skill presets, add tests	2021-05-22 12:33:22 -05:00
ship_manifest.ron	Cyclops, basilisk, air balloon offsets	2021-06-06 14:12:08 +02:00