Christof Petig a09637c80d Merge branch 'master' into 'weblate-translation' ... # Conflicts: # assets/voxygen/i18n/uk/buff.ftl # assets/voxygen/i18n/uk/common.ftl # assets/voxygen/i18n/uk/hud/settings.ftl		2023-08-28 19:43:06 +00:00
..
audio	used second sfx for teleport event	2023-08-19 11:44:58 +02:00
background	login background	2023-06-27 21:37:19 +02:00
element	digging shovel	2023-08-03 19:32:09 +02:00
font	font: add license of existing font file	2023-01-14 01:34:19 +01:00
i18n	Merge branch 'master' into 'weblate-translation'	2023-08-28 19:43:06 +00:00
lod	Added dead trees to LoD	2022-12-31 15:32:56 +00:00
shaders	new model for portal & use cultist particles	2023-08-27 19:40:49 +02:00
texture	Improved cloud visuals and performance	2022-12-15 23:56:28 +00:00
voxel	model update 2	2023-08-27 19:40:49 +02:00
item_image_manifest.ron	Reliable leather pack	2023-08-09 20:44:51 +00:00
logo.ico	Lossless compression of UI assets	2021-04-11 16:35:25 +02:00
net.veloren.veloren.desktop	Add German translation to .desktop and metainfo	2022-04-05 08:11:09 +00:00
net.veloren.veloren.metainfo.xml	Add German translation to .desktop and metainfo	2022-04-05 08:11:09 +00:00
net.veloren.veloren.png	Lossless compression of UI assets	2021-04-11 16:35:25 +02:00