Marcel 91d0227c1b Merge branch 'jdbp/update_es_ES_translation' into 'master' ... feat(i18n): update the Spanish (Castilian) translation See merge request veloren/veloren!3773		2023-01-26 08:10:17 +00:00
..
common	Decrease the duration of potion sickness to 45 seconds. Make agents more averse to incurring further stacks of potion sickness, and give villagers iced tea.	2023-01-19 15:06:13 -05: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_es_ES_translation' into 'master'	2023-01-26 08:10:17 +00:00
world	reduce mossdrake, fix woodgolem loottable	2022-11-21 14:22:15 +00:00