Update upstream source from tag 'upstream/5.1.0'

Update to upstream version '5.1.0'
with Debian dir 93ca74b8b4602fce4c9c7740e0cfdde25f086673

1 files changed, 180 insertions, 180 deletions

diff --git a/app/lib/params/O-Lehnhardt Tramrails.xtp b/app/lib/params/O-Lehnhardt Tramrails.xtp
index 5cf2add..8420497 100644
--- a/app/lib/params/O-Lehnhardt Tramrails.xtp
+++ b/app/lib/params/O-Lehnhardt Tramrails.xtp
@@ -1,180 +1,180 @@
-CONTENTS Lehnhardt O Scale TramTrack

-## Note radius for curves and turnouts are my best guess from scaling photos.

-SUBCONTENTS Lehnhardt O Scale TramTrack - Straight Track

-TURNOUT O "Lehnhardt O Scale TramTrack	360mm (14.173"") Straight	3000-50-101"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 14.173228 0.000000 90.000000

-	S 0 0 0.000000 0.000000 14.173228 0.000000

-	L 11579568 0.053333 0.000000 1.377953 14.173228 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 14.173228 -1.377953

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	240mm (9.448"") Straight	3000-50-102"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 9.448819 0.000000 90.000000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	L 11579568 0.053333 0.000000 1.377953 9.448819 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 9.448819 -1.377953

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	120mm (4.724"") Straight	3000-50-103"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.724409 0.000000 90.000000

-	S 0 0 0.000000 0.000000 4.724409 0.000000

-	L 11579568 0.053333 0.000000 1.377953 4.724409 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 4.724409 -1.377953

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	120mm (4.724"") Connect track	3000-50-104"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.724409 0.000000 90.000000

-	S 0 0 0.000000 0.000000 4.724409 0.000000

-	L 11579568 0.053333 0.000000 1.377953 4.724409 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 4.724409 -1.377953

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	70mm (2.755"") Straight	3000-50-105"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.755906 0.000000 90.000000

-	S 0 0 0.000000 0.000000 2.755906 0.000000

-	L 11579568 0.053333 0.000000 1.377953 2.755906 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 2.755906 -1.377953

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	50mm (1.968"") Straight	3000-50-106"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 1.968504 0.000000 90.000000

-	S 0 0 0.000000 0.000000 1.968504 0.000000

-	L 11579568 0.053333 0.000000 1.377953 1.968504 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 1.968504 -1.377953

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	30mm (1.181"") Straight	3000-50-107"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 1.181102 0.000000 90.000000

-	S 0 0 0.000000 0.000000 1.181102 0.000000

-	L 11579568 0.053333 0.000000 1.377953 1.181102 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 1.181102 -1.377953

-	END

-

-SUBCONTENTS Lehnhardt O Scale TramTrack - Misc Track

-TURNOUT O "Lehnhardt O Scale TramTrack	120mm 90° Crosss	3000-50-109"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.724409 0.000000 90.000000

-	E 2.362205 2.362205 0.000000

-	E 2.362205 -2.362205 180.000000

-	S 0 0 0.000000 0.000000 4.724409 0.000000

-	S 0 0 2.362205 2.362205 2.362205 -2.362205

-	L 11579568 0.053333 0.000000 1.377953 0.984252 1.377953

-	L 11579568 0.053333 3.740157 1.377953 4.724409 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 0.984252 -1.377953

-	L 11579568 0.053333 3.740157 -1.377953 4.724409 -1.377953

-	L 11579568 0.053333 0.984252 1.377953 0.984252 2.362205

-	L 11579568 0.053333 3.740157 1.377953 3.740157 2.362205

-	L 11579568 0.053333 0.984252 -1.377953 0.984252 -2.362205

-	L 11579568 0.053333 3.740157 -1.377953 3.740157 -2.362205

-	END

-

-SUBCONTENTS Lehnhardt O Scale TramTrack - Curve Track

-TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 22°30' Curve	3000-51-102"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.670542 0.929028 67.500000

-	C 0 0.000000 12.204724 0.000000 12.204724 157.500000 22.500000

-	A 11579568 0.053333 13.582677 0.000000 12.204724 157.500000 22.500000

-	A 11579568 0.053333 10.826772 0.000000 12.204724 157.500000 22.500000

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 45° Curve	3000-51-103"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 8.630038 3.574675 45.000000

-	C 0 0.000000 12.204724 0.000000 12.204724 135.000000 45.000000

-	A 11579568 0.053333 13.582677 0.000000 12.204724 135.000000 45.000000

-	A 11579568 0.053333 10.826772 0.000000 12.204724 135.000000 45.000000

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 45° Interruption	3000-51-104"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 8.630038 3.574675 45.000000

-	C 0 0.000000 12.204724 0.000000 12.204724 135.000000 45.000000

-	A 11579568 0.053333 13.582677 0.000000 12.204724 135.000000 45.000000

-	A 11579568 0.053333 10.826772 0.000000 12.204724 135.000000 45.000000

-	END

-

-SUBCONTENTS Lehnhardt O Scale TramTrack - Turnouts

-TURNOUT O "Lehnhardt O Scale TramTrack	240mm/R310mm 45° Left Manual Turnout	3000-50-113"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 9.448819 0.000000 90.000000

-	E 8.630038 3.574675 45.000000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 12.204724 0.000000 12.204724 135.000000 45.000000

-	L 11579568 0.053333 8.070866 1.377953 9.448819 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 9.448819 -1.377953

-	A 11579568 0.053333 10.826772 0.000000 12.204724 135.000000 45.000000

-	A 11579568 0.053333 13.582677 0.000000 12.204724 135.000000 8.000000

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	240mm/R310mm 45° Right Manual Turnout	3000-50-112"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 9.448819 0.000000 90.000000

-	E 8.630038 -3.574675 135.000000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 12.204724 0.000000 -12.204724 0.000000 45.000000

-	L 11579568 0.053333 8.070866 -1.377953 9.448819 -1.377953

-	L 11579568 0.053333 0.000000 1.377953 9.448819 1.377953

-	A 11579568 0.053333 10.826772 0.000000 -12.204724 0.000000 45.000000

-	A 11579568 0.053333 13.582677 0.000000 -12.204724 37.000000 8.000000

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	240mm/R310mm 45° Left Electric Turnout	3000-50-113E"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 9.448819 0.000000 90.000000

-	E 8.630038 3.574675 45.000000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 12.204724 0.000000 12.204724 135.000000 45.000000

-	L 11579568 0.053333 8.070866 1.377953 9.448819 1.377953

-	L 11579568 0.053333 0.000000 -1.377953 9.448819 -1.377953

-	A 11579568 0.053333 10.826772 0.000000 12.204724 135.000000 45.000000

-	A 11579568 0.053333 13.582677 0.000000 12.204724 135.000000 8.000000

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	240mm/R310mm 45° Right Electric Turnout	3000-50-112E"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 9.448819 0.000000 90.000000

-	E 8.630038 -3.574675 135.000000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 12.204724 0.000000 -12.204724 0.000000 45.000000

-	L 11579568 0.053333 8.070866 -1.377953 9.448819 -1.377953

-	L 11579568 0.053333 0.000000 1.377953 9.448819 1.377953

-	A 11579568 0.053333 10.826772 0.000000 -12.204724 0.000000 45.000000

-	A 11579568 0.053333 13.582677 0.000000 -12.204724 37.000000 8.000000

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 22°30' Wye Manual Turnout	3000-50-110"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 4.670542 0.929028 67.500000

-	E 4.670542 -0.929028 112.500000

-	C 0 0.000000 12.204724 0.000000 12.204724 157.500000 22.500000

-	C 0 0.000000 12.204724 0.000000 -12.204724 0.000000 22.500000

-	A 11579568 0.053333 10.826772 0.000000 12.204724 157.500000 22.500000

-	A 11579568 0.053333 10.826772 0.000000 -12.204724 0.000000 22.500000

-	END

-TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 22°30' Wye Electric Turnout	3000-50-110E"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 4.670542 0.929028 67.500000

-	E 4.670542 -0.929028 112.500000

-	C 0 0.000000 12.204724 0.000000 12.204724 157.500000 22.500000

-	C 0 0.000000 12.204724 0.000000 -12.204724 0.000000 22.500000

-	A 11579568 0.053333 10.826772 0.000000 12.204724 157.500000 22.500000

-	A 11579568 0.053333 10.826772 0.000000 -12.204724 0.000000 22.500000

-	END

+CONTENTS Lehnhardt O Scale TramTrack
+## Note radius for curves and turnouts are my best guess from scaling photos.
+SUBCONTENTS Lehnhardt O Scale TramTrack - Straight Track
+TURNOUT O "Lehnhardt O Scale TramTrack	360mm (14.173"") Straight	3000-50-101"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 14.173228 0.000000 90.000000
+	S 0 0 0.000000 0.000000 14.173228 0.000000
+	L 11579568 0.053333 0.000000 1.377953 14.173228 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 14.173228 -1.377953
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	240mm (9.448"") Straight	3000-50-102"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 9.448819 0.000000 90.000000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	L 11579568 0.053333 0.000000 1.377953 9.448819 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 9.448819 -1.377953
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	120mm (4.724"") Straight	3000-50-103"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.724409 0.000000 90.000000
+	S 0 0 0.000000 0.000000 4.724409 0.000000
+	L 11579568 0.053333 0.000000 1.377953 4.724409 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 4.724409 -1.377953
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	120mm (4.724"") Connect track	3000-50-104"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.724409 0.000000 90.000000
+	S 0 0 0.000000 0.000000 4.724409 0.000000
+	L 11579568 0.053333 0.000000 1.377953 4.724409 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 4.724409 -1.377953
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	70mm (2.755"") Straight	3000-50-105"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.755906 0.000000 90.000000
+	S 0 0 0.000000 0.000000 2.755906 0.000000
+	L 11579568 0.053333 0.000000 1.377953 2.755906 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 2.755906 -1.377953
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	50mm (1.968"") Straight	3000-50-106"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 1.968504 0.000000 90.000000
+	S 0 0 0.000000 0.000000 1.968504 0.000000
+	L 11579568 0.053333 0.000000 1.377953 1.968504 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 1.968504 -1.377953
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	30mm (1.181"") Straight	3000-50-107"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 1.181102 0.000000 90.000000
+	S 0 0 0.000000 0.000000 1.181102 0.000000
+	L 11579568 0.053333 0.000000 1.377953 1.181102 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 1.181102 -1.377953
+	END
+
+SUBCONTENTS Lehnhardt O Scale TramTrack - Misc Track
+TURNOUT O "Lehnhardt O Scale TramTrack	120mm 90° Crosss	3000-50-109"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.724409 0.000000 90.000000
+	E 2.362205 2.362205 0.000000
+	E 2.362205 -2.362205 180.000000
+	S 0 0 0.000000 0.000000 4.724409 0.000000
+	S 0 0 2.362205 2.362205 2.362205 -2.362205
+	L 11579568 0.053333 0.000000 1.377953 0.984252 1.377953
+	L 11579568 0.053333 3.740157 1.377953 4.724409 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 0.984252 -1.377953
+	L 11579568 0.053333 3.740157 -1.377953 4.724409 -1.377953
+	L 11579568 0.053333 0.984252 1.377953 0.984252 2.362205
+	L 11579568 0.053333 3.740157 1.377953 3.740157 2.362205
+	L 11579568 0.053333 0.984252 -1.377953 0.984252 -2.362205
+	L 11579568 0.053333 3.740157 -1.377953 3.740157 -2.362205
+	END
+
+SUBCONTENTS Lehnhardt O Scale TramTrack - Curve Track
+TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 22°30' Curve	3000-51-102"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.670542 0.929028 67.500000
+	C 0 0.000000 12.204724 0.000000 12.204724 157.500000 22.500000
+	A 11579568 0.053333 13.582677 0.000000 12.204724 157.500000 22.500000
+	A 11579568 0.053333 10.826772 0.000000 12.204724 157.500000 22.500000
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 45° Curve	3000-51-103"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 8.630038 3.574675 45.000000
+	C 0 0.000000 12.204724 0.000000 12.204724 135.000000 45.000000
+	A 11579568 0.053333 13.582677 0.000000 12.204724 135.000000 45.000000
+	A 11579568 0.053333 10.826772 0.000000 12.204724 135.000000 45.000000
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 45° Interruption	3000-51-104"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 8.630038 3.574675 45.000000
+	C 0 0.000000 12.204724 0.000000 12.204724 135.000000 45.000000
+	A 11579568 0.053333 13.582677 0.000000 12.204724 135.000000 45.000000
+	A 11579568 0.053333 10.826772 0.000000 12.204724 135.000000 45.000000
+	END
+
+SUBCONTENTS Lehnhardt O Scale TramTrack - Turnouts
+TURNOUT O "Lehnhardt O Scale TramTrack	240mm/R310mm 45° Left Manual Turnout	3000-50-113"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 9.448819 0.000000 90.000000
+	E 8.630038 3.574675 45.000000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 12.204724 0.000000 12.204724 135.000000 45.000000
+	L 11579568 0.053333 8.070866 1.377953 9.448819 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 9.448819 -1.377953
+	A 11579568 0.053333 10.826772 0.000000 12.204724 135.000000 45.000000
+	A 11579568 0.053333 13.582677 0.000000 12.204724 135.000000 8.000000
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	240mm/R310mm 45° Right Manual Turnout	3000-50-112"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 9.448819 0.000000 90.000000
+	E 8.630038 -3.574675 135.000000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 12.204724 0.000000 -12.204724 0.000000 45.000000
+	L 11579568 0.053333 8.070866 -1.377953 9.448819 -1.377953
+	L 11579568 0.053333 0.000000 1.377953 9.448819 1.377953
+	A 11579568 0.053333 10.826772 0.000000 -12.204724 0.000000 45.000000
+	A 11579568 0.053333 13.582677 0.000000 -12.204724 37.000000 8.000000
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	240mm/R310mm 45° Left Electric Turnout	3000-50-113E"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 9.448819 0.000000 90.000000
+	E 8.630038 3.574675 45.000000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 12.204724 0.000000 12.204724 135.000000 45.000000
+	L 11579568 0.053333 8.070866 1.377953 9.448819 1.377953
+	L 11579568 0.053333 0.000000 -1.377953 9.448819 -1.377953
+	A 11579568 0.053333 10.826772 0.000000 12.204724 135.000000 45.000000
+	A 11579568 0.053333 13.582677 0.000000 12.204724 135.000000 8.000000
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	240mm/R310mm 45° Right Electric Turnout	3000-50-112E"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 9.448819 0.000000 90.000000
+	E 8.630038 -3.574675 135.000000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 12.204724 0.000000 -12.204724 0.000000 45.000000
+	L 11579568 0.053333 8.070866 -1.377953 9.448819 -1.377953
+	L 11579568 0.053333 0.000000 1.377953 9.448819 1.377953
+	A 11579568 0.053333 10.826772 0.000000 -12.204724 0.000000 45.000000
+	A 11579568 0.053333 13.582677 0.000000 -12.204724 37.000000 8.000000
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 22°30' Wye Manual Turnout	3000-50-110"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 4.670542 0.929028 67.500000
+	E 4.670542 -0.929028 112.500000
+	C 0 0.000000 12.204724 0.000000 12.204724 157.500000 22.500000
+	C 0 0.000000 12.204724 0.000000 -12.204724 0.000000 22.500000
+	A 11579568 0.053333 10.826772 0.000000 12.204724 157.500000 22.500000
+	A 11579568 0.053333 10.826772 0.000000 -12.204724 0.000000 22.500000
+	END
+TURNOUT O "Lehnhardt O Scale TramTrack	R310mm 22°30' Wye Electric Turnout	3000-50-110E"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 4.670542 0.929028 67.500000
+	E 4.670542 -0.929028 112.500000
+	C 0 0.000000 12.204724 0.000000 12.204724 157.500000 22.500000
+	C 0 0.000000 12.204724 0.000000 -12.204724 0.000000 22.500000
+	A 11579568 0.053333 10.826772 0.000000 12.204724 157.500000 22.500000
+	A 11579568 0.053333 10.826772 0.000000 -12.204724 0.000000 22.500000
+	END