Imbris 95a38ff8f6 Merge branch 'imbris/revert-some' into 'master' ...

Revert some of the updates to make windows cross compile directx work

See merge request veloren/veloren!3918

2023-05-06 05:12:20 +00:00

..

agent

Cheesing fixes mainly focused on bosses

2023-05-06 01:57:41 +00:00

src

Merge branch 'zesterer/item-merging' into 'master'

2023-05-05 00:03:22 +00:00

Cargo.toml

Merge branch 'imbris/revert-some' into 'master'

2023-05-06 05:12:20 +00:00