mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
migration
This commit is contained in:
jshipsey
Marcel Märtens
parent
29a38e6d4f
commit
5fdb2ac01d
BIN
assets/voxygen/element/ui/crafting/icons/materials.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/ui/crafting/icons/materials.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hide/leather/back.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/hide/leather/back.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hide/leather/belt.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/hide/leather/belt.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hide/leather/chest.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/hide/leather/chest.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hide/leather/shoulder.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/hide/leather/shoulder.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hide/rawhide/back.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/hide/rawhide/back.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hide/rawhide/belt.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/hide/rawhide/belt.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hide/rawhide/chest.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/hide/rawhide/chest.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hide/rawhide/shoulder.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/hide/rawhide/shoulder.vox
(Stored with Git LFS)
Binary file not shown.
@ -49,11 +49,11 @@
|
||||
color: None
|
||||
),
|
||||
"Rawhide": (
|
||||
vox_spec: ("armor.hide.rawhide.back", (-5.0, -1.0, -11.0)),
|
||||
vox_spec: ("armor.hide.rawhide.back", (-4.0, -1.0, -6.0)),
|
||||
color: None
|
||||
),
|
||||
"Leather": (
|
||||
vox_spec: ("armor.hide.leather.back", (-4.0, -1.0, -6.0)),
|
||||
vox_spec: ("armor.hide.leather.back", (-5.0, -1.0, -11.0)),
|
||||
color: None
|
||||
),
|
||||
"Scale": (
|
||||
|
||||
@ -81,11 +81,11 @@
|
||||
color: None
|
||||
),
|
||||
"Rawhide": (
|
||||
vox_spec: ("armor.hide.rawhide.belt", (-5.0, -3.5, 2.0)),
|
||||
vox_spec: ("armor.hide.rawhide.belt", (-4.0, -3.5, 2.0)),
|
||||
color: None
|
||||
),
|
||||
"Leather": (
|
||||
vox_spec: ("armor.hide.leather.belt", (-4.0, -3.5, 2.0)),
|
||||
vox_spec: ("armor.hide.leather.belt", (-5.0, -3.5, 2.0)),
|
||||
color: None
|
||||
),
|
||||
"Scale":(
|
||||
|
||||
@ -253,31 +253,31 @@
|
||||
),
|
||||
"Rawhide": (
|
||||
left: (
|
||||
vox_spec: ("armor.hide.rawhide.shoulder", (-5.0, -3.8, -0.9)),
|
||||
vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.2, -0.5)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.8, -0.9)),
|
||||
vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.2, -0.5)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
"Leather": (
|
||||
left: (
|
||||
vox_spec: ("armor.hide.leather.shoulder", (-3.2, -3.5, 0.0)),
|
||||
vox_spec: ("armor.hide.leather.shoulder", (-5.5, -3.2, -1.8)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.hide.leather.shoulder", (-1.4, -3.5, 0.0)),
|
||||
vox_spec: ("armor.hide.leather.shoulder", (-0.5, -3.2, -1.8)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
"Scale": (
|
||||
left: (
|
||||
vox_spec: ("armor.hide.scale.shoulder", (-5.5, -4.0 , -0.5)),
|
||||
vox_spec: ("armor.hide.scale.shoulder", (-3.2, -3.5 , 0.0)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.hide.scale.shoulder", (-0.5, -4.0, -0.5)),
|
||||
vox_spec: ("armor.hide.scale.shoulder", (-1.4, -3.5, -0.5)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
|
||||
203
server/src/migrations/V39__meat_MR_organization.sql
Normal file
203
server/src/migrations/V39__meat_MR_organization.sql
Normal file
@ -0,0 +1,203 @@
|
||||
-- xx
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.belt' WHERE item_definition_id = 'common.items.armor.druid.belt';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.chest' WHERE item_definition_id = 'common.items.armor.druid.chest';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.hand' WHERE item_definition_id = 'common.items.armor.druid.hand';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.pants' WHERE item_definition_id = 'common.items.armor.druid.pants';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.shoulder' WHERE item_definition_id = 'common.items.armor.druid.shoulder';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.foot' WHERE item_definition_id = 'common.items.armor.druid.foot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.mail.steel.belt' WHERE item_definition_id = 'common.items.armor.steel.belt';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.mail.steel.chest' WHERE item_definition_id = 'common.items.armor.steel.chest';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.mail.steel.hand' WHERE item_definition_id = 'common.items.armor.steel.hand';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.mail.steel.pants' WHERE item_definition_id = 'common.items.armor.steel.pants';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.mail.steel.shoulder' WHERE item_definition_id = 'common.items.armor.steel.shoulder';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.mail.steel.foot' WHERE item_definition_id = 'common.items.armor.steel.foot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.rawhide.belt' WHERE item_definition_id = 'common.items.armor.agile.belt';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.rawhide.chest' WHERE item_definition_id = 'common.items.armor.agile.chest';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.rawhide.hand' WHERE item_definition_id = 'common.items.armor.agile.hand';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.rawhide.pants' WHERE item_definition_id = 'common.items.armor.agile.pants';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.rawhide.shoulder' WHERE item_definition_id = 'common.items.armor.agile.shoulder';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.rawhide.foot' WHERE item_definition_id = 'common.items.armor.agile.foot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.rawhide.foot' WHERE item_definition_id = 'common.items.armor.agile.foot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.rawhide.back' WHERE item_definition_id = 'common.items.armor.agile.back';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.leather.belt' WHERE item_definition_id = 'common.items.armor.swift.belt';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.leather.chest' WHERE item_definition_id = 'common.items.armor.swift.chest';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.leather.hand' WHERE item_definition_id = 'common.items.armor.swift.hand';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.leather.pants' WHERE item_definition_id = 'common.items.armor.swift.pants';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.leather.shoulder' WHERE item_definition_id = 'common.items.armor.swift.shoulder';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.leather.foot' WHERE item_definition_id = 'common.items.armor.swift.foot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.leather.foot' WHERE item_definition_id = 'common.items.armor.swift.foot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.hide.leather.head' WHERE item_definition_id = 'common.items.armor.swift.head';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.belt' WHERE item_definition_id = 'common.items.armor.plate.belt';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.chest' WHERE item_definition_id = 'common.items.armor.plate.chest';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.hand' WHERE item_definition_id = 'common.items.armor.plate.hand';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.pants' WHERE item_definition_id = 'common.items.armor.plate.pants';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.shoulder' WHERE item_definition_id = 'common.items.armor.plate.shoulder';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.armor.cloth.druid.foot' WHERE item_definition_id = 'common.items.armor.plate.foot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.gem.amethyst' WHERE item_definition_id = 'common.items.crafting_ing.amethyst';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.gem.amethyst' WHERE item_definition_id = 'common.items.crafting_ing.amethyst';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.hide.animal_hide' WHERE item_definition_id = 'common.items.crafting_ing.animal_pelt';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.log.bamboo' WHERE item_definition_id = 'common.items.crafting_ing.bamboo';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.stone.basalt' WHERE item_definition_id = 'common.items.crafting_ing.basalt';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ingot.bloodsteel' WHERE item_definition_id = 'common.items.crafting_ing.bloosteel_ingot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.bloodstone' WHERE item_definition_id = 'common.items.crafting_ing.bloodstone_ore';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.bone' WHERE item_definition_id = 'common.items.crafting_ing.bone';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ingot.bronze' WHERE item_definition_id = 'common.items.crafting_ing.bronze_ingot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.hide.carapace' WHERE item_definition_id = 'common.items.crafting_ing.carapace';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.claw' WHERE item_definition_id = 'common.items.crafting_ing.claw';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.cloth.cloth_scraps' WHERE item_definition_id = 'common.items.crafting_ing.cloth_scraps';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.cloth.cloth_scraps_red' WHERE item_definition_id = 'common.items.crafting_ing.cloth_scraps_red';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.coal' WHERE item_definition_id = 'common.items.crafting_ing.coal';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ingot.cobalt' WHERE item_definition_id = 'common.items.crafting_ing.cobalt_ingot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.copper' WHERE item_definition_id = 'common.items.crafting_ing.copper_ore';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.gem.diamond' WHERE item_definition_id = 'common.items.crafting_ing.diamond';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.hide.dragon_scale' WHERE item_definition_id = 'common.items.crafting_ing.dragon_scale';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.log.eldwood' WHERE item_definition_id = 'common.items.crafting_ing.eldwood_logs';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.ember' WHERE item_definition_id = 'common.items.crafting_ing.ember';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.gem.emerald' WHERE item_definition_id = 'common.items.crafting_ing.emerald';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.sharp_fang' WHERE item_definition_id = 'common.items.crafting_ing.fang';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.feather' WHERE item_definition_id = 'common.items.crafting_ing.feather';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.log.frostwood' WHERE item_definition_id = 'common.items.crafting_ing.frostwood_logs';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.fur' WHERE item_definition_id = 'common.items.crafting_ing.fur';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ingot.gold' WHERE item_definition_id = 'common.items.crafting_ing.gold_ingot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.gold' WHERE item_definition_id = 'common.items.crafting_ing.gold_ore';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.stone.granite' WHERE item_definition_id = 'common.items.crafting_ing.granite';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.log.hardwood' WHERE item_definition_id = 'common.items.crafting_ing.hardwood_logs';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.large_horn' WHERE item_definition_id = 'common.items.crafting_ing.horn';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.icy_fang' WHERE item_definition_id = 'common.items.crafting_ing.icy_fang';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ingot.iron' WHERE item_definition_id = 'common.items.crafting_ing.iron_ingot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.iron' WHERE item_definition_id = 'common.items.crafting_ing.iron_ore';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.log.ironwood' WHERE item_definition_id = 'common.items.crafting_ing.ironwood_logs';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.leather.simple_leather' WHERE item_definition_id = 'common.items.crafting_ing.leather';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.leather.leather_strips' WHERE item_definition_id = 'common.items.crafting_ing.leather_scraps';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.hide.leather_troll' WHERE item_definition_id = 'common.items.crafting_ing.leather_troll';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.cloth.lifecloth' WHERE item_definition_id = 'common.items.crafting_ing.lifecloth';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.cloth.linen' WHERE item_definition_id = 'common.items.crafting_ing.linen';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.cloth.moonweave' WHERE item_definition_id = 'common.items.crafting_ing.moonweave';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.stone.obsidian' WHERE item_definition_id = 'common.items.crafting_ing.obsidian';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ingot.orichalcum' WHERE item_definition_id = 'common.items.crafting_ing.orichalcum_ingot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.flowers.plant_fiber' WHERE item_definition_id = 'common.items.crafting_ing.plant_fiber';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.hide.plate' WHERE item_definition_id = 'common.items.crafting_ing.plate';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.raptor_feather' WHERE item_definition_id = 'common.items.crafting_ing.raptor_feather';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.leather.simple_leather' WHERE item_definition_id = 'common.items.crafting_ing.rawhide';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.stones' WHERE item_definition_id = 'common.items.crafting_ing.rock';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.gem.ruby' WHERE item_definition_id = 'common.items.crafting_ing.ruby';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.gem.sapphire' WHERE item_definition_id = 'common.items.crafting_ing.sapphire';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.hide.scales' WHERE item_definition_id = 'common.items.crafting_ing.scales';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.cloth.silk' WHERE item_definition_id = 'common.items.crafting_ing.silk';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ingot.silver' WHERE item_definition_id = 'common.items.crafting_ing.silver_ingot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.silver' WHERE item_definition_id = 'common.items.crafting_ing.silver_ore';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ingot.steel' WHERE item_definition_id = 'common.items.crafting_ing.steel_ingot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.silver' WHERE item_definition_id = 'common.items.crafting_ing.silver_ore';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.cloth.sunsilk' WHERE item_definition_id = 'common.items.crafting_ing.sunsilk';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ingot.tin' WHERE item_definition_id = 'common.items.crafting_ing.tin_ingot';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.tin' WHERE item_definition_id = 'common.items.crafting_ing.tin_ore';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.gem.topaz' WHERE item_definition_id = 'common.items.crafting_ing.topaz';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.venom_sac' WHERE item_definition_id = 'common.items.crafting_ing.venomsac';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.lively_vine' WHERE item_definition_id = 'common.items.crafting_ing.vine';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.animal_misc.viscous_ooze' WHERE item_definition_id = 'common.items.crafting_ing.viscous_ooze';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.log.wood' WHERE item_definition_id = 'common.items.crafting_ing.wood_logs';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.cloth.wool' WHERE item_definition_id = 'common.items.crafting_ing.wool';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.velorite' WHERE item_definition_id = 'common.items.ore.velorite';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.mineral.ore.veloritefrag' WHERE item_definition_id = 'common.items.ore.veloritefrag';
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.food.meat.fish_raw' WHERE item_definition_id = 'common.items.food.fish';
|
||||
@ -107,7 +107,7 @@ image_ids! {
|
||||
icon_utility: "voxygen.element.ui.crafting.icons.utilities",
|
||||
icon_weapon: "voxygen.element.ui.crafting.icons.weapons",
|
||||
icon_bag: "voxygen.element.items.item_bag_leather_large",
|
||||
icon_material: "voxygen.element.ui.crafting.icons.weapons",
|
||||
icon_material: "voxygen.element.ui.crafting.icons.materials",
|
||||
|
||||
// Group Window
|
||||
member_frame: "voxygen.element.ui.groups.group_member_frame",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user