Joshua Barretto 295e3c4109 Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master' ... autodelete of summoned sprites See merge request veloren/veloren!3735		2023-01-15 18:28:38 +00:00
..
common	Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master'	2023-01-15 18:28:38 +00:00
server/manifests	dark_guitar & icy_talharpa	2023-01-13 13:37:45 +00:00
test/loadout/ok	Rebase commit	2022-05-16 15:11:36 -04:00
voxygen	Merge branch 'jdbp/update_font_file' into 'master'	2023-01-15 16:04:34 +00:00
world	reduce mossdrake, fix woodgolem loottable	2022-11-21 14:22:15 +00:00