Skip to content

Commit

Permalink
Merge pull request #167 from ChronosWS/BletchChanges
Browse files Browse the repository at this point in the history
ASM 321 Changes
  • Loading branch information
Bletch1971 authored Apr 3, 2018
2 parents 94fe066 + af09757 commit 0f91a9b
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 23 deletions.
2 changes: 1 addition & 1 deletion ARK Server Manager/ARK Server Manager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PublisherName>Ark Server Manager</PublisherName>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>1.0.321.%2a</ApplicationVersion>
<ApplicationVersion>1.0.322.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>false</BootstrapperEnabled>
Expand Down
2 changes: 2 additions & 0 deletions ARK Server Manager/Globalization/en-US/en-US.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2197,6 +2197,7 @@
<sys:String x:Key="Ankylo_Character_BP_Aberrant_C">Aberrant Ankylosaurus</sys:String>
<sys:String x:Key="Arthro_Character_BP_Aberrant_C">Aberrant Arthropluera</sys:String>
<sys:String x:Key="Baryonyx_Character_BP_Aberrant_C">Aberrant Baryonyx</sys:String>
<sys:String x:Key="BigFoot_Character_BP_Aberrant_C">Aberrant Gigantopithecus</sys:String>
<sys:String x:Key="BoaFrill_Character_BP_Aberrant_C">Aberrant Titanoboa</sys:String>
<sys:String x:Key="Carno_Character_BP_Aberrant_C">Aberrant Carnotaurus</sys:String>
<sys:String x:Key="Cnidaria_Character_BP_Aberrant_C">Aberrant Cnidaria</sys:String>
Expand All @@ -2205,6 +2206,7 @@
<sys:String x:Key="Dimorph_Character_BP_Aberrant_C">Aberrant Dimorphodon</sys:String>
<sys:String x:Key="Diplocaulus_Character_BP_Aberrant_C">Aberrant Diplocaulus</sys:String>
<sys:String x:Key="Diplodocus_Character_BP_Aberrant_C">Aberrant Diplodocus</sys:String>
<sys:String x:Key="Direbear_Character_BP_Aberrant_C">Aberrant Direbear</sys:String>
<sys:String x:Key="Dodo_Character_BP_Aberrant_C">Aberrant Dodo</sys:String>
<sys:String x:Key="Doed_Character_BP_Aberrant_C">Aberrant Doedicurus</sys:String>
<sys:String x:Key="Dragonfly_Character_BP_Aberrant_C">Aberrant Meganeura</sys:String>
Expand Down
Loading

0 comments on commit 0f91a9b

Please sign in to comment.