tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update submodule. Switch to EncodingHelpers.UTF8

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-04-05 02:04:09 +02:00
parent f08d4bf7eb
commit 85241a7dce
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Parallax/ParallaxManager.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Client.Parallax
return; return;
} }
using (var reader = new StreamReader(configStream, Encoding.UTF8)) using (var reader = new StreamReader(configStream, EncodingHelpers.UTF8))
{ {
contents = reader.ReadToEnd(); contents = reader.ReadToEnd();
} }
@@ -53,7 +53,7 @@ namespace Content.Client.Parallax
{ {
bool match; bool match;
using (var data = _resourceCache.UserData.Open(ParallaxConfigOld, FileMode.Open)) using (var data = _resourceCache.UserData.Open(ParallaxConfigOld, FileMode.Open))
using (var reader = new StreamReader(data, Encoding.UTF8)) using (var reader = new StreamReader(data, EncodingHelpers.UTF8))
{ {
match = reader.ReadToEnd() == contents; match = reader.ReadToEnd() == contents;
} }
@@ -89,7 +89,7 @@ namespace Content.Client.Parallax
} }
using (var stream = _resourceCache.UserData.Open(ParallaxConfigOld, FileMode.Create)) using (var stream = _resourceCache.UserData.Open(ParallaxConfigOld, FileMode.Create))
using (var writer = new StreamWriter(stream, Encoding.UTF8)) using (var writer = new StreamWriter(stream, EncodingHelpers.UTF8))
{ {
writer.Write(contents); writer.Write(contents);
} }

2
RobustToolbox

Submodule RobustToolbox updated: 1b72be9923...506d9a8c22

1
SpaceStation14Content.sln.DotSettings
View File

@@ -7,6 +7,7 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PNG/@EntryIndexedValue">PNG</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PNG/@EntryIndexedValue">PNG</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSI/@EntryIndexedValue">RSI</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSI/@EntryIndexedValue">RSI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UTF/@EntryIndexedValue">UTF</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UV/@EntryIndexedValue">UV</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UV/@EntryIndexedValue">UV</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=BYOND/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=BYOND/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Noto/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Noto/@EntryIndexedValue">True</s:Boolean>