Merge branch 'curious-potion-naming' into 'master'

Curious potion naming fix (Issue #1896)

Closes #1896

See merge request veloren/veloren!4195

assets/common/item_i18n_manifest.ron

@@ -3163,8 +3163,8 @@
             "common.items.crafting_ing.cloth.wool",
         ): "sprite-crafting_ing-cloth-wool",
         Simple(
-            "common.items.consumable.curious_potion",
-        ): "object-curious_potion",
+            "common.items.consumable.potion_curious",
+        ): "object-potion_curious",
         Simple(
             "common.items.consumable.potion_agility",
         ): "object-potion_agility",

assets/common/loot_tables/calendar/april_fools/trickster.ron

@@ -1,5 +1,5 @@
 [
-    (1.0, Item("common.items.consumable.curious_potion")),
+    (1.0, Item("common.items.consumable.potion_curious")),
     (0.5, Item("common.items.armor.misc.head.cat_capuche")),
     (19.0, Nothing),
-]
+]

assets/voxygen/i18n/en/item/items/potion.ftl

@@ -1,7 +1,7 @@
 object-potion_red = Potent Potion
     .desc = A potent healing potion.
 
-object-curious_potion = Curious Potion
+object-potion_curious = Curious Potion
     .desc = Wonder what this does...
 
 object-potion_agility = Potion of Agility

assets/voxygen/item_image_manifest.ron

@@ -3227,8 +3227,8 @@
         "voxel.object.potion_red",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
     ),
-    Simple("common.items.consumable.curious_potion"): VoxTrans(
-        "voxel.object.curious_potion",
+    Simple("common.items.consumable.potion_curious"): VoxTrans(
+        "voxel.object.potion_curious",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
     ),
     Simple("common.items.consumable.potion_combustion"): VoxTrans(

assets/voxygen/voxel/item_drop_manifest.ron

@@ -816,7 +816,7 @@
     Simple("common.items.consumable.potion_med"): "voxel.object.potion_red",
     Simple("common.items.consumable.potion_minor"): "voxel.object.potion_red",
     Simple("common.items.consumable.potion_big"): "voxel.object.potion_red",
-    Simple("common.items.consumable.curious_potion"): "voxel.object.curious_potion",
+    Simple("common.items.consumable.potion_curious"): "voxel.object.potion_curious",
     Simple("common.items.consumable.potion_combustion"): "voxel.object.potion_combustion",
     Simple("common.items.consumable.potion_agility"): "voxel.object.potion_agility",
     Simple("common.items.charms.burning_charm"): "voxel.object.burning_charm",

server/src/migrations/V59__potion_curious.sql

@@ -0,0 +1,2 @@
+UPDATE item
+SET item_definition_id = 'common.items.consumable.potion_curious' WHERE item_definition_id = 'common.items.consumable.curious_potion';