Samuel Keiffer 8ed7da7c49 Merge branch 'master' into 'master' ... Update short_1.ron to make eligible for cloth scrap recipe See merge request veloren/veloren!1981		2021-03-23 19:29:56 +00:00
..
common	Merge branch 'master' into 'master'	2021-03-23 19:29:56 +00:00
server	airship movement bits	2021-03-21 21:43:49 -04:00
voxygen	Merge branch 'zesterer/pick' into 'master'	2021-03-22 00:19:42 +00:00
world	Sarrakitty/small fixes	2021-02-08 20:37:24 +00:00