TERA_p3104/Client-Datasheets
1
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Archgeus
2025-03-16 21:35:18 -05:00
parent b4060a9c45 58f7ed1676
commit 89951e164c
38 changed files with 11331 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DataCenter_Final_EUR/VillagerDialog/VillagerDialog-00110.xml
View File

@@ -1,5 +1,11 @@
<<<<<<< HEAD
<VillagerDialog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/VillagerDialog VillagerDialog.xsd" id="1005" huntingZoneId="58" voiceTypeId="76" xmlns="https://vezel.dev/novadrop/dc/VillagerDialog">
<Text id="1" huntingZoneId="58" prevId="0" villagerId="1005" endSocial="14">
<Page social="0">What? Why do you think you have a healthy body? Train yourself, Train!</Page>
=======
<VillagerDialog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/VillagerDialog VillagerDialog.xsd" id="1005" huntingZoneId="58" voiceTypeId="80" xmlns="https://vezel.dev/novadrop/dc/VillagerDialog">
<Text id="1" huntingZoneId="58" prevId="0" villagerId="1005" endSocial="14">
<Page social="4">What? Why do you think you have a healthy body? Train yourself, Train!</Page>
>>>>>>> baldera
</Text>
</VillagerDialog>

5
DataCenter_Final_EUR/VillagerDialog/VillagerDialog-05759.xml Normal file
View File

@@ -0,0 +1,5 @@
<VillagerDialog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/VillagerDialog VillagerDialog.xsd" id="2042" huntingZoneId="58" voiceTypeId="0" xmlns="https://vezel.dev/novadrop/dc/VillagerDialog">
<Text id="1" huntingZoneId="58" prevId="0" villagerId="2042" endSocial="0">
<Page social="0">(This teleportal takes you to any camp in Baldera.)</Page>
</Text>
</VillagerDialog>

5
DataCenter_Final_EUR/VillagerDialog/VillagerDialog-05760.xml Normal file
View File

@@ -0,0 +1,5 @@
<VillagerDialog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/VillagerDialog VillagerDialog.xsd" id="2043" huntingZoneId="58" voiceTypeId="0" xmlns="https://vezel.dev/novadrop/dc/VillagerDialog">
<Text id="1" huntingZoneId="58" prevId="0" villagerId="2043" endSocial="0">
<Page social="0">(This teleportal takes you to any camp in Baldera.)</Page>
</Text>
</VillagerDialog>