Fix z-crystal tables

Bead/Piece tables were in the demo, easy mine.
Add pouch sprites for Free/Z-Crystal, as well as a PC (unused) provided
by Suloku in #237

PKHeX/Legality/Tables7.cs

@@ -22,7 +22,7 @@ public static partial class Legal
         
         internal static readonly ushort[] Pouch_Key_SM = {
             216, 465, 466, 628, 629, 638, 696, 705, 706, 765, 773,
-            797, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 841, 842, 843, 845, 847, 850, 857, 858, 859, 860,
+            797, 841, 842, 843, 845, 847, 850, 857, 858, 859, 860,
         };
         internal static readonly ushort[] Pouch_TMHM_SM = { // 02
             328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 618, 619, 620
@@ -34,10 +34,13 @@ public static partial class Legal
         internal static readonly ushort[] Pouch_Berries_SM = {
             149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212
         };
-        internal static readonly ushort[] Pouch_ZCrystal_SM = {
+        internal static readonly ushort[] Pouch_ZCrystal_SM = { // Bead
+            807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835,
+        };
+        internal static readonly ushort[] Pouch_ZCrystalHeld_SM = { // Piece
             776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 798, 799, 800, 801, 802, 803, 804, 805, 806, 836
         };
-        internal static readonly ushort[] HeldItems_SM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystal_SM).ToArray();
+        internal static readonly ushort[] HeldItems_SM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystalHeld_SM).ToArray();
 
         private static readonly EncounterStatic[] Encounter_SM =
         {

PKHeX/PKHeX.csproj

@@ -2863,6 +2863,15 @@
   <ItemGroup>
     <None Include="Resources\img\ribbons\ribbonchampionalola.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\Bag\Bag_Free.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\Bag\Bag_PCItems.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\Bag\Bag_Z.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

PKHeX/Properties/Resources.Designer.cs

@@ -9250,6 +9250,36 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Bag_Free {
+            get {
+                object obj = ResourceManager.GetObject("Bag_Free", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Bag_PCItems {
+            get {
+                object obj = ResourceManager.GetObject("Bag_PCItems", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Bag_Z {
+            get {
+                object obj = ResourceManager.GetObject("Bag_Z", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -19004,36 +19034,36 @@ internal class Resources {
         ///恶臭
         ///降雨
         ///加速
-        ///甲虫盔甲
-        ///坚硬
+        ///战斗盔甲
+        ///结实
         ///湿气
         ///柔软
-        ///沙隐术
+        ///沙隐
         ///静电
         ///蓄电
-        ///蓄水
+        ///储水
         ///迟钝
-        ///无天气
+        ///无关天气
         ///复眼
-        ///失眠
+        ///不眠
         ///变色
         ///免疫
         ///引火
         ///鳞粉
-        ///自我中心
+        ///我行我素
         ///吸盘
         ///威吓
         ///踩影
-        ///鲨鱼皮
-        ///奇异守护
-        ///浮游
+        ///粗糙皮肤
+        ///神奇守护
+        ///飘浮
         ///孢子
-        ///同步率
-        ///净体
+        ///同步
+        ///恒净之躯
         ///自然回复
         ///避雷针
-        ///天之恩惠
-        ///轻快
+        ///天恩
+        ///悠游自如
         ///叶绿素
         ///发光
         ///复制
@@ -19041,77 +19071,74 @@ internal class Resources {
         ///毒刺
         ///精神力
         ///熔岩铠甲
-        ///水之掩护
+        ///水幕
         ///磁力
-        ///防音
-        ///接雨盘
-        ///起沙
-        ///压力
+        ///隔音
+        ///雨盘
+        ///扬沙
+        ///压迫感
         ///厚脂肪
         ///早起
         ///火焰之躯
-        ///逃足
+        ///逃跑
         ///锐利目光
         ///怪力钳
-        ///拾取
+        ///捡拾
         ///懒惰
-        ///紧张
-        ///魅惑身躯
-        ///正极
-        ///负极
-        ///气象台
+        ///活力
+        ///迷人之躯
+        ///正电
+        ///负电
+        ///阴晴不定
         ///黏着
         ///蜕皮
-        ///根性
-        ///神秘鳞片
-        ///毒液
-        ///深绿
+        ///毅力
+        ///神奇鳞片
+        ///污泥浆
+        ///茂盛
         ///猛火
         ///激流
         ///虫之预感
-        ///石脑
-        ///干旱
-        ///蚁地狱
+        ///坚硬脑袋
+        ///日照
+        ///沙穴
         ///干劲
-        ///白烟
-        ///瑜珈之力
-        ///贝壳盔甲
-        ///天气锁
+        ///白色烟雾
+        ///瑜伽之力
+        ///硬壳盔甲
+        ///气闸
         ///蹒跚
-        ///电引擎
+        ///电气引擎
         ///斗争心
         ///不屈之心
         ///雪隐
-        ///贪吃
-        ///怒穴
-        ///轻身
+        ///贪吃鬼
+        ///愤怒穴位
+        ///轻装
         ///耐热
         ///单纯
-        ///干燥肌肤
+        ///干燥皮肤
         ///下载
         ///铁拳
         ///毒疗
         ///适应力
-        ///技能连锁
-        ///湿润身躯
-        ///太阳力量
-        ///早足
-        ///普通皮肤
+        ///连续攻击
+        ///湿润之躯
+        ///太阳之力
+        ///飞毛腿
+        ///一般皮肤
         ///狙击手
-        ///魔法守护
-        ///无防御
-        ///后出
-        ///技师
-        ///绿叶守护
-        ///不器用
+        ///魔法防守
+        ///无防守
+        ///慢出
+        ///技术高手
+        ///叶子防守
+        ///笨拙
         ///破格
-        ///强运
+        ///超幸运
         ///引爆
         ///危险预知
-        ///预知梦
-        ///天然
-        ///有色眼镜
-        /// [rest of string was truncated]&quot;;.
+        ///预知梦
        /// [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string text_abilities_zh {
             get {
@@ -20522,36 +20549,36 @@ internal class Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 喜欢吃东西.
-        ///喜欢午睡.
-        ///经常打瞌睡.
-        ///总是把东西拆碎.
-        ///喜欢无拘无束.
-        ///以有力量为傲.
-        ///容易暴动.
-        ///有点容易着迷.
-        ///喜欢吵架.
-        ///血气方刚.
-        ///身体结实.
-        ///抗击打.
-        ///耐性很好.
-        ///很能忍耐.
-        ///自制力很好.
-        ///喜欢乱跑.
-        ///对声音敏感.
-        ///冲动莽撞.
-        ///有点粗鲁.
-        ///逃跑非常快.
-        ///好奇心超强.
-        ///喜欢恶作剧.
-        ///无孔不入.
-        ///总在想很多事.
-        ///非常一丝不苟.
-        ///精神强大.
-        ///有点点爱慕虚荣.
-        ///非常不服输.
-        ///讨厌失败.
-        ///有点固执..
+        ///   Looks up a localized string similar to 非常喜欢吃东西。
+        ///经常睡午觉。
+        ///常常打瞌睡。
+        ///经常乱扔东西。
+        ///喜欢悠然自在。
+        ///以力气大为傲。
+        ///喜欢胡闹。
+        ///有点容易生气。
+        ///喜欢打架。
+        ///血气方刚。
+        ///身体强壮。
+        ///抗打能力强。
+        ///顽强不屈。
+        ///能吃苦耐劳。
+        ///善于忍耐。
+        ///喜欢比谁跑得快。
+        ///对声音敏感。
+        ///冒冒失失。
+        ///有点容易得意忘形。
+        ///逃得快。
+        ///好奇心强。
+        ///喜欢恶作剧。
+        ///做事万无一失。
+        ///经常思考。
+        ///一丝不苟。
+        ///性格强势。
+        ///有一点点爱慕虚荣。
+        ///争强好胜。
+        ///不服输。
+        ///有一点点固执。.
         /// </summary>
         internal static string text_character_zh {
             get {
@@ -22960,7 +22987,11 @@ internal class Resources {
         ///X
         ///Y
         ///AS
-        ///OR.
+        ///OR
+        ///
+        ///
+        ///Sonne
+        ///Mond.
         /// </summary>
         internal static string text_games_de {
             get {
@@ -22996,7 +23027,11 @@ internal class Resources {
         ///X
         ///Y
         ///AS
-        ///OR.
+        ///OR
+        ///
+        ///
+        ///Sun
+        ///Moon.
         /// </summary>
         internal static string text_games_en {
             get {
@@ -23032,7 +23067,11 @@ internal class Resources {
         ///X
         ///Y
         ///Zafiro Alfa
-        ///Rubí Omega.
+        ///Rubí Omega
+        ///
+        ///
+        ///Sol
+        ///Luna.
         /// </summary>
         internal static string text_games_es {
             get {
@@ -23068,7 +23107,11 @@ internal class Resources {
         ///X
         ///Y
         ///AS
-        ///OR.
+        ///OR
+        ///
+        ///
+        ///Soleil
+        ///Lune.
         /// </summary>
         internal static string text_games_fr {
             get {
@@ -23104,7 +23147,11 @@ internal class Resources {
         ///X
         ///Y
         ///AS
-        ///OR.
+        ///OR
+        ///
+        ///
+        ///Sole
+        ///Luna.
         /// </summary>
         internal static string text_games_it {
             get {
@@ -23140,7 +23187,11 @@ internal class Resources {
         ///X
         ///Y
         ///AS
-        ///OR.
+        ///OR
+        ///
+        ///
+        ///サン
+        ///ムーン.
         /// </summary>
         internal static string text_games_ja {
             get {
@@ -23176,7 +23227,11 @@ internal class Resources {
         ///X
         ///Y
         ///AS
-        ///OR.
+        ///OR
+        ///
+        ///
+        ///썬
+        ///문.
         /// </summary>
         internal static string text_games_ko {
             get {
@@ -23213,7 +23268,10 @@ internal class Resources {
         ///Y
         ///始源蓝宝石
         ///终极红宝石
-        ///.
+        ///
+        ///
+        ///太阳
+        ///月亮.
         /// </summary>
         internal static string text_games_zh {
             get {
@@ -27024,55 +27082,55 @@ internal class Resources {
         /// <summary>
         ///   Looks up a localized string similar to ―――――
         ///拍击
-        ///手刀
+        ///空手劈
         ///连环巴掌
         ///连续拳
-        ///百万吨拳击
+        ///百万吨重拳
         ///聚宝功
         ///火焰拳
-        ///急冻拳
-        ///雷光掌
-        ///利爪
-        ///剪断
-        ///剪刀断头台
+        ///冰冻拳
+        ///雷电拳
+        ///抓
+        ///夹住
+        ///断头钳
         ///旋风刀
         ///剑舞
-        ///一字斩
-        ///烈暴风
+        ///居合斩
+        ///起风
         ///翅膀攻击
-        ///旋风
+        ///吹飞
         ///飞翔
         ///绑紧
-        ///叩打
+        ///摔打
         ///藤鞭
-        ///践踏
-        ///连环腿
-        ///百万吨飞腿
+        ///踩踏
+        ///二连踢
+        ///百万吨重踢
         ///飞踢
-        ///旋风腿
-        ///飞沙脚
-        ///铁头功
+        ///回旋踢
+        ///泼沙
+        ///头锤
         ///角撞
-        ///疯狂攻击
-        ///独角钻
-        ///冲击
+        ///乱击
+        ///角钻
+        ///撞击
         ///泰山压顶
-        ///捆绑
+        ///紧束
         ///猛撞
-        ///横冲直撞
-        ///舍身攻击
+        ///大闹一番
+        ///舍身冲撞
         ///摇尾巴
         ///毒针
         ///双针
         ///飞弹针
         ///瞪眼
-        ///咬咬
-        ///嚎叫
+        ///咬住
+        ///叫声
         ///吼叫
         ///唱歌
         ///超音波
         ///音爆
-        ///石化功
+        ///定身法
         ///溶解液
         ///火花
         ///喷射火焰
@@ -27080,54 +27138,55 @@ internal class Resources {
         ///水枪
         ///水炮
         ///冲浪
-        ///急冻光线
+        ///冰冻光束
         ///暴风雪
-        ///幻象光
+        ///幻象光线
         ///泡沫光线
         ///极光束
-        ///破坏死光
+        ///破坏光线
         ///啄
-        ///冲钻
-        ///地狱滚动
-        ///下踢
-        ///返拳
+        ///啄钻
+        ///地狱翻滚
+        ///踢倒
+        ///双倍奉还
         ///地球上投
-        ///劲力
-        ///吸收
-        ///百万吨吸收
+        ///怪力
+        ///吸取
+        ///超级吸取
         ///寄生种子
         ///生长
         ///飞叶快刀
-        ///阳光烈焰
-        ///毒粉末
+        ///日光束
+        ///毒粉
         ///麻痹粉
-        ///睡眠粉
-        ///花之舞
+        ///催眠粉
+        ///花瓣舞
         ///吐丝
         ///龙之怒
-        ///火焰漩涡
+        ///火焰旋涡
         ///电击
         ///十万伏特
         ///电磁波
         ///打雷
-        ///滚石
+        ///落石
         ///地震
         ///地裂
-        ///挖地洞
-        ///猛毒素
+        ///挖洞
+        ///剧毒
         ///念力
-        ///幻象术
+        ///精神强念
         ///催眠术
         ///瑜伽姿势
         ///高速移动
         ///电光一闪
         ///愤怒
         ///瞬间移动
-        ///黑夜诅咒
+        ///黑夜魔影
         ///模仿
-        ///噪音
+        ///刺耳声
         ///影子分身
-        ///自 [rest of string was truncated]&quot;;.
+        ///自我再生
+        ///变硬
        /// [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string text_moves_zh {
             get {
@@ -27367,29 +27426,29 @@ internal class Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 努力
-        ///孤独
+        ///   Looks up a localized string similar to 勤奋
+        ///怕寂寞
         ///勇敢
         ///固执
-        ///调皮
+        ///顽皮
         ///大胆
-        ///直率
+        ///坦率
         ///悠闲
         ///淘气
         ///乐天
         ///胆小
         ///急躁
         ///认真
-        ///开朗
+        ///爽朗
         ///天真
-        ///保守
-        ///稳重
+        ///内敛
+        ///慢吞吞
         ///冷静
         ///害羞
         ///马虎
-        ///沉着
+        ///温和
         ///温顺
-        ///狂妄
+        ///自大
         ///慎重
         ///浮躁.
         /// </summary>
@@ -28667,13 +28726,13 @@ internal class Resources {
         ///水箭龟
         ///绿毛虫
         ///铁甲蛹
-        ///巴大蝴
+        ///巴大蝶
         ///独角虫
-        ///铁壳昆
+        ///铁壳蛹
         ///大针蜂
         ///波波
         ///比比鸟
-        ///比雕
+        ///大比鸟
         ///小拉达
         ///拉达
         ///烈雀
@@ -28684,10 +28743,10 @@ internal class Resources {
         ///雷丘
         ///穿山鼠
         ///穿山王
-        ///尼多兰♀
+        ///尼多兰
         ///尼多娜
         ///尼多后
-        ///尼多朗♂
+        ///尼多朗
         ///尼多力诺
         ///尼多王
         ///皮皮
@@ -28704,7 +28763,7 @@ internal class Resources {
         ///派拉斯
         ///派拉斯特
         ///毛球
-        ///末入蛾
+        ///摩鲁蛾
         ///地鼠
         ///三地鼠
         ///喵喵
@@ -28712,14 +28771,14 @@ internal class Resources {
         ///可达鸭
         ///哥达鸭
         ///猴怪
-        ///火爆猴
+        ///火暴猴
         ///卡蒂狗
         ///风速狗
         ///蚊香蝌蚪
-        ///蚊香蛙
-        ///快泳蛙
+        ///蚊香君
+        ///蚊香泳士
         ///凯西
-        ///勇吉拉
+        ///勇基拉
         ///胡地
         ///腕力
         ///豪力
@@ -28735,7 +28794,7 @@ internal class Resources {
         ///小火马
         ///烈焰马
         ///呆呆兽
-        ///呆河马
+        ///呆壳兽
         ///小磁怪
         ///三合一磁怪
         ///大葱鸭
@@ -28746,21 +28805,20 @@ internal class Resources {
         ///臭泥
         ///臭臭泥
         ///大舌贝
-        ///铁甲贝
+        ///刺甲贝
         ///鬼斯
         ///鬼斯通
         ///耿鬼
         ///大岩蛇
-        ///素利普
-        ///素利拍
+        ///催眠貘
+        ///引梦貘人
         ///大钳蟹
         ///巨钳蟹
-        ///雷电球
-        ///顽皮弹
+        ///霹雳电球
+        ///顽皮雷弹
         ///蛋蛋
         ///椰蛋树
-        ///可拉可拉
-        ///嘎 [rest of string was truncated]&quot;;.
+        ///卡拉卡拉 [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string text_species_zh {
             get {

PKHeX/Properties/Resources.resx

@@ -6472,4 +6472,13 @@
   <data name="ribbonchampionalola" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\ribbons\ribbonchampionalola.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Bag_Free" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Bag\Bag_Free.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Bag_PCItems" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Bag\Bag_PCItems.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Bag_Z" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Bag\Bag_Z.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

PKHeX/Saves/SAV7.cs

@@ -380,12 +380,12 @@ public override InventoryPouch[] Inventory
             {
                 InventoryPouch[] pouch =
                 {
-                    new InventoryPouch(InventoryType.Items, Legal.Pouch_Items_SM, 995, OFS_PouchHeldItem),
+                    new InventoryPouch(InventoryType.Items, Legal.Pouch_Items_SM, 999, OFS_PouchHeldItem),
                     new InventoryPouch(InventoryType.KeyItems, Legal.Pouch_Key_SM, 1, OFS_PouchKeyItem),
                     new InventoryPouch(InventoryType.TMHMs, Legal.Pouch_TMHM_SM, 1, OFS_PouchTMHM),
-                    new InventoryPouch(InventoryType.Medicine, Legal.Pouch_Medicine_SM, 995, OFS_PouchMedicine),
-                    new InventoryPouch(InventoryType.Berries, Legal.Pouch_Berries_SM, 995, OFS_PouchBerry),
-                    new InventoryPouch(InventoryType.ZCrystals, Legal.Pouch_ZCrystal_SM, 995, OFS_PouchZCrystals),
+                    new InventoryPouch(InventoryType.Medicine, Legal.Pouch_Medicine_SM, 999, OFS_PouchMedicine),
+                    new InventoryPouch(InventoryType.Berries, Legal.Pouch_Berries_SM, 999, OFS_PouchBerry),
+                    new InventoryPouch(InventoryType.ZCrystals, Legal.Pouch_ZCrystal_SM, 999, OFS_PouchZCrystals),
                 };
                 foreach (var p in pouch)
                     p.getPouch7(ref Data);

PKHeX/Saves/Substructures/Inventory.cs

@@ -13,8 +13,9 @@ public enum InventoryType
         Balls,
         BattleItems,
         MailItems,
+        PCItems,
+        FreeSpace,
         ZCrystals,
-        FreeSpace
     }
     public class InventoryItem
     {

PKHeX/Subforms/Save Editors/SAV_Inventory.Designer.cs

@@ -83,6 +83,9 @@ private void InitializeComponent()
             this.IL_Pouch.Images.SetKeyName(5, "Bag_Balls.png");
             this.IL_Pouch.Images.SetKeyName(6, "Bag_Battle.png");
             this.IL_Pouch.Images.SetKeyName(7, "Bag_Mail.png");
+            this.IL_Pouch.Images.SetKeyName(8, "Bag_PCItems.png");
+            this.IL_Pouch.Images.SetKeyName(9, "Bag_Free.png");
+            this.IL_Pouch.Images.SetKeyName(10, "Bag_Z.png");
             // 
             // B_GiveAll
             // 

PKHeX/Subforms/Save Editors/SAV_Inventory.resx

@@ -124,8 +124,8 @@
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABc
-        DwAAAk1TRnQBSQFMAgEBCAEAARgBAAEIAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
+        EwAAAk1TRnQBSQFMAgEBCwEAARABAAEQAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABYAMAAUgDAAEBAQABCAYAARsYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -153,44 +153,62 @@
         AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
         AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
         AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
-        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8A/wD/AP8A
-        /wD/AAwAFHEEABRLBAAUrAQAFJADABZxAgAWSwIAFqwCABaQAQAYcRhLGKwYkBhxGEsYrBiQCXEE/wtx
-        CUsG/wlLDqwC/wisBZAP/wSQB3EC/wHcAs0B3AL/CXEHSwL/AdwEzQHcAv8HSw2sAf8BzQH/CKwFkAH/
-        Dc0B/wSQBnEB/wHcBs0B3AH/CHEGSwH/AdwIzQHcAf8GSwWsBP8CrAL/As0B/wisBZAB/wHNC9wBzQH/
-        BJAGcQH/CM0B/whxBUsB/wHcCs0B3AH/BUsFrAH/As0B3AL/AdwDzQH/CKwFkAH/Ac0L3AHNAf8EkAVx
-        Af8B3AjNAdwB/wdxBUsB/wzNAf8FSwasAf8IzQH/CKwFkAH/Ac0L3AHNAf8EkAVxAf8KzQH/B3EESwH/
-        AdwEzQHcAv8B3ATNAdwB/wRLBqwB/wHcB80F/wSsBZAB/wHNC9wBzQH/BJAFTwH/A80B3AbNAf8HTwRS
-        Af8EzQHcAf8CzQH/AdwEzQH/BFIHrQH/As0E3AXNAf8ErQWWAf8BzQvcAc0B/wSWBU8B/wHcAc0C/wHc
-        BM0B3AH/B08EUgH/BNwB/wTNAf8E3AH/BFIHrQL/A80C3ATNAf8FrQWWAf8BzQTcA80E3AHNAf8ElgZV
-        Af8CzQH/Bc0B/whVBFkG/wTNBv8EWQbVAf8B3ALNBNwCzQHcAf8G1QW5Af8BzQPcAc0D3AHNA9wBzQH/
-        BLkGVQH/AdwGzQHcAf8IVQRZAf8EzQHcAf8CzQH/AdwEzQH/BFkF1QH/BM0C3APNAv8H1QW5Af8BzQLc
-        Ac0F3AHNAtwBzQH/BLkHVQL/AdwCzQHcAv8DVQL/BFUEWQH/AdwEzQHcAv8B3ATNAdwB/wRZBNUB/wXN
-        BNwCzQH/B9UFuQH/Ac0B3AHNB9wBzQHcAc0B/wS5CVUB/wLcAf8EVQH/AdwB/wRVBVkB/wzNAf8FWQTV
-        Bf8HzQHcAf8G1QW5Af8CzQncAs0B/wS5CVUB/wLNAdwD/wHcAs0B/wRVBVkB/wHcCs0B3AH/BVkI1QH/
-        CM0B/wbVBbkB/wHNC9wBzQH/BLkJVQH/AdwHzQHcAf8EVQZZAf8B3AjNAdwB/wZZCNUB/wPNAdwC/wHc
-        As0B/wXVBbkB/wHNC9wBzQH/BLkKVQH/AdwFzQHcAf8FVQdZAv8B3ATNAdwC/wdZCNUB/wLNAv8C1QT/
-        BdUFuQH/Dc0B/wS5C1UC/wPNAv8GVQlZBv8JWQjVAf8BzQH/DdUFuQ//BLkNVQP/CFUYWQjVAv8O1Ri5
-        GFUYWRjVGLkBABZVAgAWWQIAFtUCABa5AwAUVQQAFFkEABTVBAAUuQQAFI0EABSoBAAUUAQAFEsDABaN
-        AgAWqAIAFlACABZLAQAYjRioGFAYSxiNGKgYUBhLCY0G/wmNB6gE/w2oClAE/wpQBksM/wZLB40C/wHc
-        BM0B3AL/B40FqAL/AdwCzQHcAv8LqAhQAv8EzQL/CFAGSwH/Cc0B3AH/BksGjQH/AdwIzQHcAf8GjQWo
-        Af8GzQH/C6gHUAH/As0B3AL/AdwCzQH/B1AGSwH/Cc0B3AH/BksGjQH/Cs0B/waNBKgB/wHcAs0C/wLN
-        AdwB/wqoBlAB/wHNAdwE/wPcAc0B/wZQBksB/wnNAdwB/wZLBY0B/wHcCs0B3AH/BY0EqAH/As0B/wKo
-        Af8CzQH/CqgFUAH/Ac0B3AT/BdwBzQH/BVAGSwH/Cc0B3AH/BksFjQH/DM0B/wWNBKgB/wLNAf8CqAH/
-        As0B/wqoBVAB/wHNBf8F3AHNAf8FUAZLAf8JzQHcAf8GSwWOAf8MzQH/BY4EygH/AdwCzQL/As0B3AH/
-        CsoEVwH/Ac0B3AP/AdwCzQXcAc0B/wRXBkwB/wrcAf8GTAWOAf8B3ArNAdwB/wWOBcoB/wbNAf8CygH/
-        CMoEVwH/Ac0E/wHNAlcBzQLcAv8BzQH/BFcGTAH/CtwB/wZMBrcB/wrNAf8GtwXQAv8B3APNAdwB/wHQ
-        Af8B3AH/B9AEXAH/Ac0C/wLcAc0CXAHNBP8BzQH/BFwGTQH/Cc0B3AH/Bk0GtwH/AdwIzQHcAf8GtwfQ
-        A/8CzQHcAf8B3ALNAf8G0ARcAf8BzQXcAs0B3AP/AdwBzQH/BFwGTQH/Cc0B3AH/Bk0HtwL/BtwC/we3
-        CtAB/wLNAdwCzQH/AdwB/wXQBVwB/wHNBdwF/wHNAf8FXAZNAf8JzQHcAf8GTQi3Af8B3ATNAdwB/wi3
-        C9AB/wPNAf8B3ALNAf8E0AVcAf8BzQXcBP8B3AHNAf8FXAZNAv8I3AL/Bk0HtwH/AdwGzQHcAf8HtwzQ
-        Af8CzQHcAs0B/wXQBlwB/wHNA9wE/wHcAc0B/wZcB00B/wfNAdwB/wdNBrcB/wHcCM0B3AH/BrcN0AH/
-        A80B/wbQB1wB/wLNAdwC/wHcAs0B/wdcB00B/wfNAdwB/wdNBrcB/wHcCM0B3AH/BrcO0AH/Ac0B/wfQ
-        CFwC/wTNAv8IXAdNAf8HzQHcAf8HTQe3Cv8Htw/QAf8I0ApcBP8KXAdNCv8HTRi3GNAYXBhNGLcY0Bhc
-        GE0BABa3AgAW0AIAFlwCABZNAwAUtwQAFNAEABRcBAAUTQIAAUIBTQE+BwABPgMAASgDAAFgAwABSAMA
-        AQEBAAEBBQABYAEDFgAD//8AIgABwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBgAEAAQEBgAEAAQEBgAEA
-        AQEBgAEAAQHwAAGAAQABAQGAAQABAQGAAQABAQGAAQABAQHAAQABAwHAAQABAwHAAQABAwHAAQABAwHA
-        AQABAwHAAQABAwHAAQABAwHAAQABAwGAAQABAQGAAQABAQGAAQABAQGAAQABAfAAAYABAAEBAYABAAEB
-        AYABAAEBAYABAAEBAcABAAEDAcABAAEDAcABAAEDAcABAAEDCw==
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wMAFI0EABSSBAAUZxsA
+        Fo0CABaSAgAWZxkAGI0YkhhnGAAGjQz/Bo0YkhhnGAAFjQH/DBUB/wWNGJIYZxgABY0B/wEVAewBUAHs
+        AfEBUAHxAewB8QHsAhUB/wWNCZIB7QHrAhMB6wHtCZIKZwQSCmcYAAWNAf8BFQGNAvEBSwHxAY0B8QEV
+        AfEB7AEVAf8FjQiSAe0BbQEVAu0BFQFtAe0IkglnARIEEwESCWcYAAWNAf8BFQFQAewBUALsAVAC7AFQ
+        AewBFQH/BY0HkgHtAeoBFAHtAvMB7QEUAeoB7QeSB2cBEgITARIBtQHvARICEwESB2cYAAWNAf8BFQnx
+        AewBFQH/BY0GkgHtAeoBEwHvAfQC/wH0Ae8BEwHqAe0GkgZnARICEwFtAbUBCQHzAfEB6wITARIGZxgA
+        Bo0B/woVAf8GjQWSAe0BbQETAQcG/wEHARMBbQHtBZIEZwISARMBEgHsAwkB8wLyAfcBEgETARIFZxgA
+        BY4B/wEVCuwBFQH/BY4F7wHtARUB9wj/AfcBFQHtBe8ErgETARIB6gG1BAkD8wHyAQgBbQETARIErhgA
+        BY4B/wEVAQcIFQHsARUB/wWOBe8B6wFtAfII/wHyAW0B6wXvA64BbQETAa4GCQXzAfEB7AETAW0DrhgA
+        BbcB/wEVAewBFQHsBPEB7AEVAQcBFQH/BbcFBwFtAewK/wHsAW0FBwOvAa4BEwHsAfEL8wHtARMBrgOv
+        GAAFtwH/ARUB7AIVAVAB7AGNARUB7AEVAewBFQH/BbcFBwFtAewK/wHsAW0FBwSvAhIBbQG8CPMB8AHr
+        ARIBEwGNA68YAAW3Af8BFQHsARUB7ALxAVAB7AFQARUB7AEVAf8FtwUHAewB6gHwA/8CvAP/AfAB6gHs
+        BQcFrwFtAhIB9wbzAe8B6gESAW0BjQSvGAAFtwH/ARUB7AgVAewBFQH/BbcFBwH3ARMB7AEHAfAB7wLs
+        Ae8B8AEHAewBFAH3BQcGrwFtAhIB6wHxAvMB8gH4AhIBbQavGAAFtwH/ARUBBwHsAQcB7AEHAewBBwHs
+        AQcB7AEVAf8FtwYHAZIBEgEUARIBFAITARQBEgEUARIBkgYHB68BrgESARMB6gIHAhIB6gGuB68YAAW3
+        Af8BFQrxARUB/wW3BwcB7wGSAe0B9wIHAfcB7QGSAe8HBwmvAW0DEwESAW0JrxgABbcB/wEVCvEBFQH/
+        BbcYBwqvAa4CbQGuCq8YAAW3Av8KFQL/BbcYBxivGAAGtwz/BrcYBxivGAAYtxgHGK8ZABa3AgAWBwIA
+        Fq8bABS3BAAUBwQAFK8cABRxBAAUSwQAFKwEABSQAwAWcQIAFksCABasAgAWkAEAGHEYSxisGJAYcRhL
+        GKwYkAlxBP8LcQlLBv8JSw6sAv8IrAWQD/8EkAdxAv8B3ALNAdwC/wlxB0sC/wHcBM0B3AL/B0sNrAH/
+        Ac0B/wisBZAB/w3NAf8EkAZxAf8B3AbNAdwB/whxBksB/wHcCM0B3AH/BksFrAT/AqwC/wLNAf8IrAWQ
+        Af8BzQvcAc0B/wSQBnEB/wjNAf8IcQVLAf8B3ArNAdwB/wVLBawB/wLNAdwC/wHcA80B/wisBZAB/wHN
+        C9wBzQH/BJAFcQH/AdwIzQHcAf8HcQVLAf8MzQH/BUsGrAH/CM0B/wisBZAB/wHNC9wBzQH/BJAFcQH/
+        Cs0B/wdxBEsB/wHcBM0B3AL/AdwEzQHcAf8ESwasAf8B3AfNBf8ErAWQAf8BzQvcAc0B/wSQBU8B/wPN
+        AdwGzQH/B08EUgH/BM0B3AH/As0B/wHcBM0B/wRSB60B/wLNBNwFzQH/BK0FlgH/Ac0L3AHNAf8ElgVP
+        Af8B3AHNAv8B3ATNAdwB/wdPBFIB/wTcAf8EzQH/BNwB/wRSB60C/wPNAtwEzQH/Ba0FlgH/Ac0E3APN
+        BNwBzQH/BJYGVQH/As0B/wXNAf8IVQRZBv8EzQb/BFkG1QH/AdwCzQTcAs0B3AH/BtUFuQH/Ac0D3AHN
+        A9wBzQPcAc0B/wS5BlUB/wHcBs0B3AH/CFUEWQH/BM0B3AH/As0B/wHcBM0B/wRZBdUB/wTNAtwDzQL/
+        B9UFuQH/Ac0C3AHNBdwBzQLcAc0B/wS5B1UC/wHcAs0B3AL/A1UC/wRVBFkB/wHcBM0B3AL/AdwEzQHc
+        Af8EWQTVAf8FzQTcAs0B/wfVBbkB/wHNAdwBzQfcAc0B3AHNAf8EuQlVAf8C3AH/BFUB/wHcAf8EVQVZ
+        Af8MzQH/BVkE1QX/B80B3AH/BtUFuQH/As0J3ALNAf8EuQlVAf8CzQHcA/8B3ALNAf8EVQVZAf8B3ArN
+        AdwB/wVZCNUB/wjNAf8G1QW5Af8BzQvcAc0B/wS5CVUB/wHcB80B3AH/BFUGWQH/AdwIzQHcAf8GWQjV
+        Af8DzQHcAv8B3ALNAf8F1QW5Af8BzQvcAc0B/wS5ClUB/wHcBc0B3AH/BVUHWQL/AdwEzQHcAv8HWQjV
+        Af8CzQL/AtUE/wXVBbkB/w3NAf8EuQtVAv8DzQL/BlUJWQb/CVkI1QH/Ac0B/w3VBbkP/wS5DVUD/whV
+        GFkI1QL/DtUYuRhVGFkY1Ri5AQAWVQIAFlkCABbVAgAWuQMAFFUEABRZBAAU1QQAFLkEABSNBAAUqAQA
+        FFAEABRLAwAWjQIAFqgCABZQAgAWSwEAGI0YqBhQGEsYjRioGFAYSwmNBv8JjQeoBP8NqApQBP8KUAZL
+        DP8GSweNAv8B3ATNAdwC/weNBagC/wHcAs0B3AL/C6gIUAL/BM0C/whQBksB/wnNAdwB/wZLBo0B/wHc
+        CM0B3AH/Bo0FqAH/Bs0B/wuoB1AB/wLNAdwC/wHcAs0B/wdQBksB/wnNAdwB/wZLBo0B/wrNAf8GjQSo
+        Af8B3ALNAv8CzQHcAf8KqAZQAf8BzQHcBP8D3AHNAf8GUAZLAf8JzQHcAf8GSwWNAf8B3ArNAdwB/wWN
+        BKgB/wLNAf8CqAH/As0B/wqoBVAB/wHNAdwE/wXcAc0B/wVQBksB/wnNAdwB/wZLBY0B/wzNAf8FjQSo
+        Af8CzQH/AqgB/wLNAf8KqAVQAf8BzQX/BdwBzQH/BVAGSwH/Cc0B3AH/BksFjgH/DM0B/wWOBMoB/wHc
+        As0C/wLNAdwB/wrKBFcB/wHNAdwD/wHcAs0F3AHNAf8EVwZMAf8K3AH/BkwFjgH/AdwKzQHcAf8FjgXK
+        Af8GzQH/AsoB/wjKBFcB/wHNBP8BzQJXAc0C3AL/Ac0B/wRXBkwB/wrcAf8GTAa3Af8KzQH/BrcF0AL/
+        AdwDzQHcAf8B0AH/AdwB/wfQBFwB/wHNAv8C3AHNAlwBzQT/Ac0B/wRcBk0B/wnNAdwB/wZNBrcB/wHc
+        CM0B3AH/BrcH0AP/As0B3AH/AdwCzQH/BtAEXAH/Ac0F3ALNAdwD/wHcAc0B/wRcBk0B/wnNAdwB/wZN
+        B7cC/wbcAv8HtwrQAf8CzQHcAs0B/wHcAf8F0AVcAf8BzQXcBf8BzQH/BVwGTQH/Cc0B3AH/Bk0ItwH/
+        AdwEzQHcAf8ItwvQAf8DzQH/AdwCzQH/BNAFXAH/Ac0F3AT/AdwBzQH/BVwGTQL/CNwC/wZNB7cB/wHc
+        Bs0B3AH/B7cM0AH/As0B3ALNAf8F0AZcAf8BzQPcBP8B3AHNAf8GXAdNAf8HzQHcAf8HTQa3Af8B3AjN
+        AdwB/wa3DdAB/wPNAf8G0AdcAf8CzQHcAv8B3ALNAf8HXAdNAf8HzQHcAf8HTQa3Af8B3AjNAdwB/wa3
+        DtAB/wHNAf8H0AhcAv8EzQL/CFwHTQH/B80B3AH/B00Htwr/B7cP0AH/CNAKXAT/ClwHTQr/B00YtxjQ
+        GFwYTRi3GNAYXBhNAQAWtwIAFtACABZcAgAWTQMAFLcEABTQBAAUXAQAFE0CAAFCAU0BPgcAAT4DAAEo
+        AwABYAMAAUgDAAEBAQABAQUAAWABAxYAA/8BAAHAAQABAwHAAQABAwHAAQABAwMAAYABAAEBAYABAAEB
+        AYABAAEB8wABgAEAAQEBgAEAAQEBgAEAAQEDAAHAAQABAwHAAQABAwHAAQABAwMAAcABAAEDAcABAAED
+        AcABAAEDAcABAAEDAYABAAEBAYABAAEBAYABAAEBAYABAAEB8AABgAEAAQEBgAEAAQEBgAEAAQEBgAEA
+        AQEBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBgAEAAQEBgAEA
+        AQEBgAEAAQEBgAEAAQHwAAGAAQABAQGAAQABAQGAAQABAQGAAQABAQHAAQABAwHAAQABAwHAAQABAwHA
+        AQABAws=
 </value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />