Merge fixes

code/ryzom/server/r2_shard/data_shard/mirror_sheets/fe_temp.dataset

@@ -292,14 +292,14 @@
       </STRUCT>
       <STRUCT>
         <ATOM Name="name" Value="PvpMode"/>
-        <ATOM Name="type" Value="uint8"/>
+        <ATOM Name="type" Value="uint16"/>
         <ATOM Name="persistant" Value="true"/>
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
       </STRUCT>
       <STRUCT>
         <ATOM Name="name" Value="PvpClan"/>
-        <ATOM Name="type" Value="uint8"/>
+        <ATOM Name="type" Value="uint32"/>
         <ATOM Name="persistant" Value="true"/>
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
@@ -339,6 +339,13 @@
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
       </STRUCT>
+      <STRUCT>
+        <ATOM Name="name" Value="NPCAlias"/>
+        <ATOM Name="type" Value="uint32"/>
+        <ATOM Name="persistant" Value="false"/>
+        <ATOM Name="mirror" Value="true"/>
+        <ATOM Name="weight" Value="1"/>
+      </STRUCT>
     </ARRAY>
     <ATOM Name="max number of rows or entities" Value="15000"/>
     <ARRAY Name="entity types">