Update upstream source from tag 'upstream/5.1.0'

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

1 files changed, 233 insertions, 233 deletions

diff --git a/app/lib/params/O-ETS.xtp b/app/lib/params/O-ETS.xtp
index 282a33e..95edbc5 100644
--- a/app/lib/params/O-ETS.xtp
+++ b/app/lib/params/O-ETS.xtp
@@ -1,233 +1,233 @@
-CONTENTS Electric Train System O Scale Track

-SUBCONTENTS Electric Train System O Scale - Straight Track

-TURNOUT O "Electric Train System O Scale	240mm (9.448"") Straight	611"

-	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

-	END

-TURNOUT O "Electric Train System O Scale	120mm (4.724"") Straight	612"

-	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

-	END

-TURNOUT O "Electric Train System O Scale	60mm (2.362"") Straight	613"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.362205 0.000000 90.000000

-	S 0 0 0.000000 0.000000 2.362205 0.000000

-	END

-TURNOUT O "Electric Train System O Scale	36mm (1.417"") Straight	614"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 1.417323 0.000000 90.000000

-	S 0 0 0.000000 0.000000 1.417323 0.000000

-	END

-

-SUBCONTENTS Electric Train System O Scale - Misc Track

-TURNOUT O "Electric Train System O Scale	120mm Connecting Break track	751"

-	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 1.000000 1.375000 1.062992 1.375000 -1.062992

-	L 11579568 1.000000 3.375000 1.062992 3.375000 -1.062992

-	END

-TURNOUT O "Electric Train System O Scale	240mm Connecting Track	752"

-	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 1.000000 4.724409 1.062992 4.724409 -1.062992

-	END

-TURNOUT O "Electric Train System O Scale	120mm Buffer Stop DR	861"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	S 0 0 0.000000 0.000000 4.724409 0.000000

-	L 11579568 0.500000 3.543307 1.000000 3.543307 -1.000000

-	END

-TURNOUT O "Electric Train System O Scale	120mm Buffer Stop CSD	862"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	S 0 0 0.000000 0.000000 4.724409 0.000000

-	L 11579568 0.500000 3.543307 1.000000 3.543307 -1.000000

-	END

-TURNOUT O "Electric Train System O Scale	Railroad Crossing Gate	835"

-	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

-	F 32768 0.000000 4

-		0.295275 0.688973 0

-		0.295275 6.594488 0

-		9.152543 6.594488 0

-		9.152543 0.688973 0

-	F 11579568 0.000000 4

-		1.220472 0.688973 0

-		1.220472 6.594488 0

-		8.228346 6.594488 0

-		8.228346 0.688973 0

-	F 8404992 0.000000 4

-		1.220472 0.531496 0

-		8.228346 0.531496 0

-		8.228346 -0.531496 0

-		1.220472 -0.531496 0

-	F 32768 0.000000 4

-		0.295275 -0.688973 0

-		0.295275 -6.594488 0

-		9.152543 -6.594488 0

-		9.152543 -0.688973 0

-	F 11579568 0.000000 4

-		1.220472 -0.688973 0

-		1.220472 -6.594488 0

-		8.228346 -6.594488 0

-		8.228346 -0.688973 0

-		END

-TURNOUT O "Electric Train System O Scale	Level Crossing	836"

-	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

-	F 32768 0.000000 4

-		0.295275 0.688973 0

-		0.295275 6.594488 0

-		9.152543 6.594488 0

-		9.152543 0.688973 0

-	F 11579568 0.000000 4

-		1.220472 0.688973 0

-		1.220472 6.594488 0

-		8.228346 6.594488 0

-		8.228346 0.688973 0

-	F 8404992 0.000000 4

-		1.220472 0.531496 0

-		8.228346 0.531496 0

-		8.228346 -0.531496 0

-		1.220472 -0.531496 0

-	F 32768 0.000000 4

-		0.295275 -0.688973 0

-		0.295275 -6.594488 0

-		9.152543 -6.594488 0

-		9.152543 -0.688973 0

-	F 11579568 0.000000 4

-		1.220472 -0.688973 0

-		1.220472 -6.594488 0

-		8.228346 -6.594488 0

-		8.228346 -0.688973 0

-		END

-

-SUBCONTENTS Electric Train System O Scale - Curve Track

-TURNOUT O "Electric Train System O Scale	R672mm 22°30' Curve	631"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 9.446548 1.879034 67.500000

-	C 0 0.000000 -24.685039 0.000033 24.685039 157.500076 22.500000

-	END

-TURNOUT O "Electric Train System O Scale	R672mm 11°25' Curve	632"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 4.815808 0.474315 78.750000

-	C 0 0.000000 -24.685039 0.000000 24.685039 168.750000 11.250000

-	END

-TURNOUT O "Electric Train System O Scale	R672mm 5°42' Curve	633"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 2.419555 0.118865 84.375000

-	C 0 0.000000 -24.685039 0.000000 24.685039 174.375000 5.625000

-	END

-TURNOUT O "Electric Train System O Scale	R747mm 22°30' Curve	634"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 11.254500 2.238657 67.500000

-	C 0 0.000000 -29.409449 0.000000 29.409449 157.500000 22.500000

-	END

-

-SUBCONTENTS Electric Train System O Scale - Turnouts

-TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Left Remote Turnout	651"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 9.448819 0.000000 90.000000

-	E 9.446548 1.879034 67.500000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 24.685039 0.000000 24.685039 157.500000 22.500000

-	END

-TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Right Remote Turnout	652"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 9.448819 0.000000 90.000000

-	E 9.446548 -1.879034 112.500000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 24.685039 0.000000 -24.685039 0.000000 22.500000

-	END

-TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Left Manual Turnout	653"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 9.448819 0.000000 90.000000

-	E 9.446548 1.879034 67.500000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 24.685039 0.000000 24.685039 157.500000 22.500000

-	END

-TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Right Manual Turnout	654"

-	P "Normal" 1

-	P "Reverse" 2

-	E 0.000000 0.000000 270.000000

-	E 9.448819 0.000000 90.000000

-	E 9.446548 -1.879034 112.500000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 24.685039 0.000000 -24.685039 0.000000 22.500000

-	END

-TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Three-Way Manual Turnout	655"

-	P "Normal" 1

-	P "Reverse" 2

-	P "Reverse" 3

-	E 0.000000 0.000000 270.000000

-	E 9.446548 1.879034 67.500000

-	E 9.448819 0.000000 90.000000

-	E 9.446548 -1.879034 112.500000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 24.685039 0.000000 24.685039 157.500000 22.500000

-	C 0 0.000000 24.685039 0.000000 -24.685039 0.000000 22.500000

-	END

-TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Three-Way Remote Turnout	656"

-	P "Normal" 1

-	P "Reverse" 2

-	P "Reverse" 3

-	E 0.000000 0.000000 270.000000

-	E 9.446548 1.879034 67.500000

-	E 9.448819 0.000000 90.000000

-	E 9.446548 -1.879034 112.500000

-	S 0 0 0.000000 0.000000 9.448819 0.000000

-	C 0 0.000000 24.685039 0.000000 24.685039 157.500000 22.500000

-	C 0 0.000000 24.685039 0.000000 -24.685039 0.000000 22.500000

-	END

-

-SUBCONTENTS Electric Train System O Scale - Turntable

-TURNOUT O "Electric Train System O Scale	240mm 22°30' Turntable	863"

-	P "1" 1 2

-	P "2" 3 4 5

-	P "3" 6 7 8

-	P "4" 9 10

-	E 0.000000 0.000000 270.000000

-	E 0.000000 7.086614 0.000000

-	E 2.711930 6.547178 22.500000

-	E 5.010993 5.010993 45.000000

-	E 6.547178 2.711930 67.500000

-	E -2.711930 -6.547178 202.500000

-	E -5.010993 -5.010993 225.000000

-	S 0 0.000000 0.000000 7.086614 0.000000 4.724409

-	S 16777215 0.000000 0.000000 4.724409 0.000000 -4.724409

-	S 0 0.000000 2.711930 6.547178 1.807953 4.364785

-	S 16777215 0.000000 1.807953 4.364785 -1.807953 -4.364785

-	S 0 0.000000 -1.807953 -4.364785 -2.711930 -6.547178

-	S 0 0.000000 5.010993 5.010993 3.340662 3.340662

-	S 16777215 0.000000 3.340662 3.340662 -3.340662 -3.340662

-	S 0 0.000000 -3.340662 -3.340662 -5.010993 -5.010993

-	S 0 0.000000 6.547178 2.711930 4.364785 1.807953

-	S 16777215 0.000000 4.364785 1.807953 -4.364785 -1.807953

-	A 0 0 4.724409 0.000000 0.000000 0.000000 360.000000

-	A 0 0 7.086614 0.000000 0.000000 0.000000 360.000000

-	G 11579568 0 4.724409 0.000000 0.000000 0.000000 360.000000

-	END

+CONTENTS Electric Train System O Scale Track
+SUBCONTENTS Electric Train System O Scale - Straight Track
+TURNOUT O "Electric Train System O Scale	240mm (9.448"") Straight	611"
+	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
+	END
+TURNOUT O "Electric Train System O Scale	120mm (4.724"") Straight	612"
+	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
+	END
+TURNOUT O "Electric Train System O Scale	60mm (2.362"") Straight	613"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.362205 0.000000 90.000000
+	S 0 0 0.000000 0.000000 2.362205 0.000000
+	END
+TURNOUT O "Electric Train System O Scale	36mm (1.417"") Straight	614"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 1.417323 0.000000 90.000000
+	S 0 0 0.000000 0.000000 1.417323 0.000000
+	END
+
+SUBCONTENTS Electric Train System O Scale - Misc Track
+TURNOUT O "Electric Train System O Scale	120mm Connecting Break track	751"
+	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 1.000000 1.375000 1.062992 1.375000 -1.062992
+	L 11579568 1.000000 3.375000 1.062992 3.375000 -1.062992
+	END
+TURNOUT O "Electric Train System O Scale	240mm Connecting Track	752"
+	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 1.000000 4.724409 1.062992 4.724409 -1.062992
+	END
+TURNOUT O "Electric Train System O Scale	120mm Buffer Stop DR	861"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	S 0 0 0.000000 0.000000 4.724409 0.000000
+	L 11579568 0.500000 3.543307 1.000000 3.543307 -1.000000
+	END
+TURNOUT O "Electric Train System O Scale	120mm Buffer Stop CSD	862"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	S 0 0 0.000000 0.000000 4.724409 0.000000
+	L 11579568 0.500000 3.543307 1.000000 3.543307 -1.000000
+	END
+TURNOUT O "Electric Train System O Scale	Railroad Crossing Gate	835"
+	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
+	F 32768 0.000000 4
+		0.295275 0.688973 0
+		0.295275 6.594488 0
+		9.152543 6.594488 0
+		9.152543 0.688973 0
+	F 11579568 0.000000 4
+		1.220472 0.688973 0
+		1.220472 6.594488 0
+		8.228346 6.594488 0
+		8.228346 0.688973 0
+	F 8404992 0.000000 4
+		1.220472 0.531496 0
+		8.228346 0.531496 0
+		8.228346 -0.531496 0
+		1.220472 -0.531496 0
+	F 32768 0.000000 4
+		0.295275 -0.688973 0
+		0.295275 -6.594488 0
+		9.152543 -6.594488 0
+		9.152543 -0.688973 0
+	F 11579568 0.000000 4
+		1.220472 -0.688973 0
+		1.220472 -6.594488 0
+		8.228346 -6.594488 0
+		8.228346 -0.688973 0
+		END
+TURNOUT O "Electric Train System O Scale	Level Crossing	836"
+	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
+	F 32768 0.000000 4
+		0.295275 0.688973 0
+		0.295275 6.594488 0
+		9.152543 6.594488 0
+		9.152543 0.688973 0
+	F 11579568 0.000000 4
+		1.220472 0.688973 0
+		1.220472 6.594488 0
+		8.228346 6.594488 0
+		8.228346 0.688973 0
+	F 8404992 0.000000 4
+		1.220472 0.531496 0
+		8.228346 0.531496 0
+		8.228346 -0.531496 0
+		1.220472 -0.531496 0
+	F 32768 0.000000 4
+		0.295275 -0.688973 0
+		0.295275 -6.594488 0
+		9.152543 -6.594488 0
+		9.152543 -0.688973 0
+	F 11579568 0.000000 4
+		1.220472 -0.688973 0
+		1.220472 -6.594488 0
+		8.228346 -6.594488 0
+		8.228346 -0.688973 0
+		END
+
+SUBCONTENTS Electric Train System O Scale - Curve Track
+TURNOUT O "Electric Train System O Scale	R672mm 22°30' Curve	631"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 9.446548 1.879034 67.500000
+	C 0 0.000000 -24.685039 0.000033 24.685039 157.500076 22.500000
+	END
+TURNOUT O "Electric Train System O Scale	R672mm 11°25' Curve	632"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.815808 0.474315 78.750000
+	C 0 0.000000 -24.685039 0.000000 24.685039 168.750000 11.250000
+	END
+TURNOUT O "Electric Train System O Scale	R672mm 5°42' Curve	633"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.419555 0.118865 84.375000
+	C 0 0.000000 -24.685039 0.000000 24.685039 174.375000 5.625000
+	END
+TURNOUT O "Electric Train System O Scale	R747mm 22°30' Curve	634"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 11.254500 2.238657 67.500000
+	C 0 0.000000 -29.409449 0.000000 29.409449 157.500000 22.500000
+	END
+
+SUBCONTENTS Electric Train System O Scale - Turnouts
+TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Left Remote Turnout	651"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 9.448819 0.000000 90.000000
+	E 9.446548 1.879034 67.500000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 24.685039 0.000000 24.685039 157.500000 22.500000
+	END
+TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Right Remote Turnout	652"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 9.448819 0.000000 90.000000
+	E 9.446548 -1.879034 112.500000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 24.685039 0.000000 -24.685039 0.000000 22.500000
+	END
+TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Left Manual Turnout	653"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 9.448819 0.000000 90.000000
+	E 9.446548 1.879034 67.500000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 24.685039 0.000000 24.685039 157.500000 22.500000
+	END
+TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Right Manual Turnout	654"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 9.448819 0.000000 90.000000
+	E 9.446548 -1.879034 112.500000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 24.685039 0.000000 -24.685039 0.000000 22.500000
+	END
+TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Three-Way Manual Turnout	655"
+	P "Normal" 1
+	P "Reverse" 2
+	P "Reverse" 3
+	E 0.000000 0.000000 270.000000
+	E 9.446548 1.879034 67.500000
+	E 9.448819 0.000000 90.000000
+	E 9.446548 -1.879034 112.500000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 24.685039 0.000000 24.685039 157.500000 22.500000
+	C 0 0.000000 24.685039 0.000000 -24.685039 0.000000 22.500000
+	END
+TURNOUT O "Electric Train System O Scale	240mm/R672mm 22°30' Three-Way Remote Turnout	656"
+	P "Normal" 1
+	P "Reverse" 2
+	P "Reverse" 3
+	E 0.000000 0.000000 270.000000
+	E 9.446548 1.879034 67.500000
+	E 9.448819 0.000000 90.000000
+	E 9.446548 -1.879034 112.500000
+	S 0 0 0.000000 0.000000 9.448819 0.000000
+	C 0 0.000000 24.685039 0.000000 24.685039 157.500000 22.500000
+	C 0 0.000000 24.685039 0.000000 -24.685039 0.000000 22.500000
+	END
+
+SUBCONTENTS Electric Train System O Scale - Turntable
+TURNOUT O "Electric Train System O Scale	240mm 22°30' Turntable	863"
+	P "1" 1 2
+	P "2" 3 4 5
+	P "3" 6 7 8
+	P "4" 9 10
+	E 0.000000 0.000000 270.000000
+	E 0.000000 7.086614 0.000000
+	E 2.711930 6.547178 22.500000
+	E 5.010993 5.010993 45.000000
+	E 6.547178 2.711930 67.500000
+	E -2.711930 -6.547178 202.500000
+	E -5.010993 -5.010993 225.000000
+	S 0 0.000000 0.000000 7.086614 0.000000 4.724409
+	S 16777215 0.000000 0.000000 4.724409 0.000000 -4.724409
+	S 0 0.000000 2.711930 6.547178 1.807953 4.364785
+	S 16777215 0.000000 1.807953 4.364785 -1.807953 -4.364785
+	S 0 0.000000 -1.807953 -4.364785 -2.711930 -6.547178
+	S 0 0.000000 5.010993 5.010993 3.340662 3.340662
+	S 16777215 0.000000 3.340662 3.340662 -3.340662 -3.340662
+	S 0 0.000000 -3.340662 -3.340662 -5.010993 -5.010993
+	S 0 0.000000 6.547178 2.711930 4.364785 1.807953
+	S 16777215 0.000000 4.364785 1.807953 -4.364785 -1.807953
+	A 0 0 4.724409 0.000000 0.000000 0.000000 360.000000
+	A 0 0 7.086614 0.000000 0.000000 0.000000 360.000000
+	G 11579568 0 4.724409 0.000000 0.000000 0.000000 360.000000
+	END