+ Updating item_image_manifest to Master (was behind)

2024-08-30 18:12:32 +00:00 · 2021-11-03 00:37:59 +01:00 · 2021-11-03 00:37:59 +01:00 · 4e19f2444b
commit 4e19f2444b
parent 81846f313f
1 changed files with 2 additions and 1 deletions
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //  Png(specifier),
 //  Vox(specier),
 //  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
@ -2949,4 +2950,4 @@
        "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
    ),
-})
+)]