Revert "merge stash"

This reverts commit 6057d267744a5e9322b93155918293f04db4eecb.

server/src/item.rs

@@ -484,7 +484,7 @@ impl Item {
             Item::DecayI |
             Item::DecayII | 
             Item::DecayIII => format!(
-                "Reduces healing taken by {:?}% and deals {:?}% BluePower as BlueDamage each turn. Lasts {:?}T",
+                "Reduces healing taken by {:?}% and deals blue damage {:?}% blue power each turn. Lasts {:?}T",
                 100 - self.into_skill().unwrap().effect().first().unwrap().get_multiplier(),
                 self.into_skill().unwrap().multiplier(),
                 self.into_skill().unwrap().effect().first().unwrap().get_duration()),
@@ -522,7 +522,7 @@ impl Item {
                 "Impurity increases Green Power by {:?}%, Blue based Attack skills will blast again dealing {:?}{}. Lasts {:?}T",
                 self.into_skill().unwrap().effect().first().unwrap().get_multiplier() - 100,
                  Skill::ImpureBlast.multiplier(),
-                "% GreenPower as BlueDamage",
+                "% GreenPower as BluePower",
                 self.into_skill().unwrap().effect().first().unwrap().get_duration()),
 
             Item::InvertI |
@@ -882,8 +882,7 @@ impl From<Skill> for Item {
             Skill::TestBlock => Item::TestBlock,
             Skill::TestParry => Item::TestParry,
             Skill::TestSiphon => Item::TestSiphon,
-
-            // _ => panic!("{:?} not implemented with item conversion", skill),
+            _ => panic!("{:?} not implemented with item conversion", skill),
         }
     }
 }