+ Updating item_image_manifest to Master (was behind)

2024-08-30 18:12:32 +00:00 · 2021-11-03 00:40:02 +01:00 · 2021-11-03 00:40:02 +01:00 · f009b3fb65
commit f009b3fb65
parent 5221be5d42
1 changed files with 1 additions and 2 deletions
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //  Png(specifier),
 //  Vox(specier),
 //  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
@ -2888,4 +2887,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,
    ),
-)]
+})