Joshua Barretto 504ea158d2 Merge branch 'zesterer/towns' into 'master' ... Improvements to towns and NPCs See merge request veloren/veloren!3867		2023-04-13 21:03:02 +00:00
..
common	Merge branch 'zesterer/towns' into 'master'	2023-04-13 21:03:02 +00:00
server/manifests	Ability changes	2023-03-26 21:41:22 -04:00
test/loadout/ok	Rebase commit	2022-05-16 15:11:36 -04:00
voxygen	Merge branch 'zesterer/towns' into 'master'	2023-04-13 21:03:02 +00:00
world	taoist&floppy/cyclops&dullahan	2023-04-12 22:53:38 +00:00