Skip to content

Commit 839636f

Browse files
committed
Automatic merge of T1.5.1-974-g2634ac3be and 16 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at b3f83ed: Blueprint/train car operations UI window - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #900 at c27f32d: DMI updates - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #912 at cda1d74: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #922 at abe2e52: Autopilot for timetable mode - Pull request #943 at fb1f454: Dynamic Brakes Behavior & Display Improvements - Pull request #945 at 263cbf3: Display tractive force instead of compensated out force - Pull request #946 at 47fcd1c: Advanced track sounds - Pull request #947 at 6be9776: Fix .ace Textures Not Being Used as Fallback for Missing .dds
18 parents 47a028a + 2634ac3 + dfc715e + d00beb9 + f92de76 + b3f83ed + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + cda1d74 + 26cc6a8 + abe2e52 + fb1f454 + 263cbf3 + 47fcd1c + 6be9776 commit 839636f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Source/RunActivity/Viewer3D/Materials.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public Texture2D Get(string path, Texture2D defaultTexture, bool required = fals
8383
if (File.Exists(aceTexture))
8484
{
8585
texture = Orts.Formats.Msts.AceFile.Texture2DFromFile(GraphicsDevice, aceTexture);
86-
Trace.TraceWarning("Required texture {1} not existing; using existing texture {2}", path, aceTexture);
86+
Trace.TraceWarning("Required texture {0} not existing; using existing texture {1}", path, aceTexture);
8787
}
8888
else return defaultTexture;
8989
}

0 commit comments

Comments
 (0)