mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
+ Updating item_image_manifest to Master (was behind)
This commit is contained in:
parent
e69a6b82dc
commit
1b1fee4f0b
@ -1,4 +1,3 @@
|
||||
<<<<<<< HEAD
|
||||
// Png(specifier),
|
||||
// Vox(specier),
|
||||
// VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
|
||||
|
Loading…
Reference in New Issue
Block a user