Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1

1 files changed, 135 insertions, 135 deletions

diff --git a/app/lib/params/HO-Mehano.xtp b/app/lib/params/HO-Mehano.xtp
index 5ff9743..04f571f 100644
--- a/app/lib/params/HO-Mehano.xtp
+++ b/app/lib/params/HO-Mehano.xtp
@@ -1,135 +1,135 @@
-CONTENTS Mehano HO Track

-SUBCONTENTS Mehano Track - Straights

-TURNOUT HO "Mehano	Flex Section 914.4mm	F245"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 36.000000 0.000000 90.000000

-	S 0 0.000000 0.000000 0.000000 36.000000 0.000000

-	END

-TURNOUT HO "Mehano	Straight Track 228.6mm	F223"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 9.000000 0.000000 90.000000

-	S 0 0.000000 0.000000 0.000000 9.000000 0.000000

-	END

-TURNOUT HO "Mehano	Straight Track 152.4mm	F238"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 6.000000 0.000000 90.000000

-	S 0 0.000000 0.000000 0.000000 6.000000 0.000000

-	END

-TURNOUT HO "Mehano	Straight Track 76.2mm	F239"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 3.000000 0.000000 90.000000

-	S 0 0.000000 0.000000 0.000000 3.000000 0.000000

-	END

-

-SUBCONTENTS Mehano Track - Curves

-TURNOUT HO "Mehano	Curve Track 457.2mm 30d	F210"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 9.000000 2.411542 60.000000

-	C 0 0.000000 -18.000000 0.000000 18.000000 150.000000 30.000000

-	END

-TURNOUT HO "Mehano	Curved Terminal/Rerailer Track	F269"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 9.000000 2.411542 60.000000

-	C 0 0.000000 -18.000000 0.000000 18.000000 150.000000 30.000000

-	A 7960953 0.600000 -17.300000 0.000000 18.000000 155.000000 20.000000

-	A 7960953 0.500000 -18.000000 0.000000 18.000000 155.000000 20.000000

-	A 7960953 0.600000 -18.700000 0.000000 18.000000 155.000000 20.000000

-	A 7960953 0.500000 -19.200000 0.000000 18.000000 163.750000 2.500000

-	END

-TURNOUT HO "Mehano	Curved Track 457.2mm 10d	F233"

-	P "Normal" 1

-	E 0.000000 0.000000 270.000000

-	E 3.125667 0.273460 80.000000

-	C 0 0.000000 -18.000000 0.000000 18.000000 170.000000 10.000000

-	END

-

-SUBCONTENTS Mehano Track - Crossings

-TURNOUT HO "Mehano	45d Crossing Track 76.2mm	F228"

-	P "Normal" 1 0 2

-	E 0.000000 0.000000 270.000000

-	E 3.000000 0.000000 90.000000

-	E 0.439338 1.060658 315.000000

-	E 2.560662 -1.060658 135.000000

-	S 0 0.000000 0.000000 0.000000 3.000000 0.000000

-	S 0 0.000000 0.439338 1.060658 2.560662 -1.060658

-	END

-

-SUBCONTENTS Mehano Track - Switches

-TURNOUT HO "Mehano	Left Remote Switch	F278"

-	P "Normal" 1 2

-	P "Reverse" 1 3 4

-	E 0.000000 0.000000 270.000000

-	E 9.000000 0.000000 90.000000

-	E 7.656415 1.085533 70.000000

-	S 0 0.000000 0.000000 0.000000 2.149705 0.000000

-	S 0 0.000000 2.149705 0.000000 9.000000 0.000000

-	C 0 0.000000 -14.315797 2.149724 14.315797 160.000000 20.000000

-	S 0 0.000000 7.046027 0.863360 7.656415 1.085533

-	F4 7960953 0.000000 6 1

-		1.500000 -0.600000 0

-		1.500000 -1.000000 0

-		1.850000 -1.200000 0

-		5.650000 -1.200000 0

-		6.000000 -1.000000 0

-		6.000000 -0.600000 0

-	END

-TURNOUT HO "Mehano	Right Remote Switch	F279"

-	P "Normal" 1 2

-	P "Reverse" 1 3 4

-	E 0.000000 0.000000 270.000000

-	E 9.000000 0.000000 90.000000

-	E 7.656415 -1.085533 110.000000

-	S 0 0.000000 0.000000 0.000000 2.149705 0.000000

-	S 0 0.000000 2.149705 0.000000 9.000000 0.000000

-	C 0 0.000000 14.315797 2.149648 -14.315797 0.000000 20.000000

-	S 0 0.000000 7.046027 -0.863360 7.656415 -1.085533

-	F4 7960953 0.000000 6 1

-		1.500000 0.600000 0

-		1.500000 1.000000 0

-		1.850000 1.200000 0

-		5.650000 1.200000 0

-		6.000000 1.000000 0

-		6.000000 0.600000 0

-	END

-TURNOUT HO "Mehano	Left Manual Switch	F282"

-	P "Normal" 1 2

-	P "Reverse" 1 3 4

-	E 0.000000 0.000000 270.000000

-	E 9.000000 0.000000 90.000000

-	E 7.656415 1.085533 70.000000

-	S 0 0.000000 0.000000 0.000000 2.149705 0.000000

-	S 0 0.000000 2.149705 0.000000 9.000000 0.000000

-	C 0 0.000000 -14.315797 2.149724 14.315797 160.000000 20.000000

-	S 0 0.000000 7.046027 0.863360 7.656415 1.085533

-	F4 7960953 0.000000 6 1

-		1.500000 -0.600000 0

-		1.500000 -1.000000 0

-		1.850000 -1.200000 0

-		5.650000 -1.200000 0

-		6.000000 -1.000000 0

-		6.000000 -0.600000 0

-	END

-TURNOUT HO "Mehano	Right Manual Switch	F283"

-	P "Normal" 1 2

-	P "Reverse" 1 3 4

-	E 0.000000 0.000000 270.000000

-	E 9.000000 0.000000 90.000000

-	E 7.656415 -1.085533 110.000000

-	S 0 0.000000 0.000000 0.000000 2.149705 0.000000

-	S 0 0.000000 2.149705 0.000000 9.000000 0.000000

-	C 0 0.000000 14.315797 2.149648 -14.315797 0.000000 20.000000

-	S 0 0.000000 7.046027 -0.863360 7.656415 -1.085533

-	F4 7960953 0.000000 6 1

-		1.500000 0.600000 0

-		1.500000 1.000000 0

-		1.850000 1.200000 0

-		5.650000 1.200000 0

-		6.000000 1.000000 0

-		6.000000 0.600000 0

-	END

+CONTENTS Mehano HO Track
+SUBCONTENTS Mehano Track - Straights
+TURNOUT HO "Mehano	Flex Section 914.4mm	F245"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 36.000000 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 36.000000 0.000000
+	END$SEGS
+TURNOUT HO "Mehano	Straight Track 228.6mm	F223"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 9.000000 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 9.000000 0.000000
+	END$SEGS
+TURNOUT HO "Mehano	Straight Track 152.4mm	F238"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.000000 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 6.000000 0.000000
+	END$SEGS
+TURNOUT HO "Mehano	Straight Track 76.2mm	F239"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 3.000000 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 3.000000 0.000000
+	END$SEGS
+
+SUBCONTENTS Mehano Track - Curves
+TURNOUT HO "Mehano	Curve Track 457.2mm 30d	F210"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 9.000000 2.411542 60.000000
+	C 0 0.000000 -18.000000 0.000000 18.000000 150.000000 30.000000
+	END$SEGS
+TURNOUT HO "Mehano	Curved Terminal/Rerailer Track	F269"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 9.000000 2.411542 60.000000
+	C 0 0.000000 -18.000000 0.000000 18.000000 150.000000 30.000000
+	A 7960953 0.600000 -17.300000 0.000000 18.000000 155.000000 20.000000
+	A 7960953 0.500000 -18.000000 0.000000 18.000000 155.000000 20.000000
+	A 7960953 0.600000 -18.700000 0.000000 18.000000 155.000000 20.000000
+	A 7960953 0.500000 -19.200000 0.000000 18.000000 163.750000 2.500000
+	END$SEGS
+TURNOUT HO "Mehano	Curved Track 457.2mm 10d	F233"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 3.125667 0.273460 80.000000
+	C 0 0.000000 -18.000000 0.000000 18.000000 170.000000 10.000000
+	END$SEGS
+
+SUBCONTENTS Mehano Track - Crossings
+TURNOUT HO "Mehano	45d Crossing Track 152.4mm	F228"
+	P "Normal" 1 0 2
+	E 0.000000 0.000000 270.000000
+	E 6.000000 0.000000 90.000000
+	E 0.878680 2.121320 315.000000
+	E 5.121320 -2.121320 135.000000
+	S 0 0.000000 0.000000 0.000000 6.000000 0.000000
+	S 0 0.000000 0.878680 2.121320 5.121320 -2.121320
+	END$SEGS
+
+SUBCONTENTS Mehano Track - Switches
+TURNOUT HO "Mehano	Left Remote Switch	F278"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 9.000000 0.000000 90.000000
+	E 7.656415 1.085533 70.000000
+	S 0 0.000000 0.000000 0.000000 2.149705 0.000000
+	S 0 0.000000 2.149705 0.000000 9.000000 0.000000
+	C 0 0.000000 -14.315797 2.149724 14.315797 160.000000 20.000000
+	S 0 0.000000 7.046027 0.863360 7.656415 1.085533
+	F4 7960953 0.000000 6 1
+		1.500000 -0.600000 0
+		1.500000 -1.000000 0
+		1.850000 -1.200000 0
+		5.650000 -1.200000 0
+		6.000000 -1.000000 0
+		6.000000 -0.600000 0
+	END$SEGS
+TURNOUT HO "Mehano	Right Remote Switch	F279"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 9.000000 0.000000 90.000000
+	E 7.656415 -1.085533 110.000000
+	S 0 0.000000 0.000000 0.000000 2.149705 0.000000
+	S 0 0.000000 2.149705 0.000000 9.000000 0.000000
+	C 0 0.000000 14.315797 2.149648 -14.315797 0.000000 20.000000
+	S 0 0.000000 7.046027 -0.863360 7.656415 -1.085533
+	F4 7960953 0.000000 6 1
+		1.500000 0.600000 0
+		1.500000 1.000000 0
+		1.850000 1.200000 0
+		5.650000 1.200000 0
+		6.000000 1.000000 0
+		6.000000 0.600000 0
+	END$SEGS
+TURNOUT HO "Mehano	Left Manual Switch	F282"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 9.000000 0.000000 90.000000
+	E 7.656415 1.085533 70.000000
+	S 0 0.000000 0.000000 0.000000 2.149705 0.000000
+	S 0 0.000000 2.149705 0.000000 9.000000 0.000000
+	C 0 0.000000 -14.315797 2.149724 14.315797 160.000000 20.000000
+	S 0 0.000000 7.046027 0.863360 7.656415 1.085533
+	F4 7960953 0.000000 6 1
+		1.500000 -0.600000 0
+		1.500000 -1.000000 0
+		1.850000 -1.200000 0
+		5.650000 -1.200000 0
+		6.000000 -1.000000 0
+		6.000000 -0.600000 0
+	END$SEGS
+TURNOUT HO "Mehano	Right Manual Switch	F283"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 9.000000 0.000000 90.000000
+	E 7.656415 -1.085533 110.000000
+	S 0 0.000000 0.000000 0.000000 2.149705 0.000000
+	S 0 0.000000 2.149705 0.000000 9.000000 0.000000
+	C 0 0.000000 14.315797 2.149648 -14.315797 0.000000 20.000000
+	S 0 0.000000 7.046027 -0.863360 7.656415 -1.085533
+	F4 7960953 0.000000 6 1
+		1.500000 0.600000 0
+		1.500000 1.000000 0
+		1.850000 1.200000 0
+		5.650000 1.200000 0
+		6.000000 1.000000 0
+		6.000000 0.600000 0
+	END$SEGS