Marcel f063dcd939 Merge branch 'alphyr/assets_manager0_5' into 'master' ... Update `assets_manager` to 0.5 See merge request veloren/veloren!2501		2021-06-27 15:50:16 +00:00
..
common	Add is_recycling field to recipe book	2021-06-26 21:37:13 +03:00
server	Gem Rings and small change to trading.	2021-06-26 02:44:02 +00:00
voxygen	Merge branch 'alphyr/assets_manager0_5' into 'master'	2021-06-27 15:50:16 +00:00
world	Merge branch 'aweinstock/lava' into 'master'	2021-06-21 20:49:44 +00:00