Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

2021-10-03 21:25:20 +02:00 · 2021-10-03 21:25:20 +02:00 · 332a7074e5
parent 799792e49c 7cfb0fcb08
commit 332a7074e5
11 changed files with 3 additions and 0 deletions
--- a/P3D/Content/Data/Scripts/ecruteak/suicune_encounter.dat
+++ b/P3D/Content/Data/Scripts/ecruteak/suicune_encounter.dat
--- a/P3D/Content/Data/Scripts/eusine/route14.dat
+++ b/P3D/Content/Data/Scripts/eusine/route14.dat
--- a/P3D/Content/Data/Scripts/eusine/route42map.dat
+++ b/P3D/Content/Data/Scripts/eusine/route42map.dat
--- a/P3D/Content/Data/Scripts/eusine/suicunebattle.dat
+++ b/P3D/Content/Data/Scripts/eusine/suicunebattle.dat
--- a/P3D/Content/Data/Scripts/eusine/vermilion.dat
+++ b/P3D/Content/Data/Scripts/eusine/vermilion.dat
--- a/P3D/Content/Data/Scripts/radio_tower_start.dat
+++ b/P3D/Content/Data/Scripts/radio_tower_start.dat
--- a/P3D/Content/Data/Scripts/route25/nochar.dat
+++ b/P3D/Content/Data/Scripts/route25/nochar.dat
--- a/P3D/Content/Data/Scripts/vermilion/snorlaxawake.dat
+++ b/P3D/Content/Data/Scripts/vermilion/snorlaxawake.dat
--- a/P3D/Content/Data/maps/routes/route14.dat
+++ b/P3D/Content/Data/maps/routes/route14.dat
--- a/P3D/Content/Data/maps/routes/route42.dat
+++ b/P3D/Content/Data/maps/routes/route42.dat
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@ -28144,6 +28144,9 @@
    <Content Include="Content\Data\Scripts\diamonddive\bigup.dat">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <Content Include="Content\Data\Scripts\eusine\route42map.dat">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <None Include="Content\Data\Scripts\faraway\ancestoremblemcheck.dat">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>