Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

+ Updating item_image_manifest to Master (was behind)

Browse Source
This commit is contained in:
UncomfySilence
2021-11-03 00:40:02 +01:00
parent 4e19f2444b
commit 8d86f62f2e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/voxygen/item_image_manifest.ron
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
// Png(specifier), // Png(specifier),
// Vox(specier), // Vox(specier),
// VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom) // VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
@ -2950,4 +2949,4 @@
"voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle", "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
(0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
), ),
)] })