Merge tag 'upstream/4.2.4a'

Upstream version 4.2.4a

1 files changed, 186 insertions, 0 deletions

diff --git a/app/lib/params/O-Bassett-Lowke (discontinued).xtp b/app/lib/params/O-Bassett-Lowke (discontinued).xtp
new file mode 100644
index 0000000..743cbec
--- /dev/null
+++ b/app/lib/params/O-Bassett-Lowke (discontinued).xtp
@@ -0,0 +1,186 @@
+CONTENTS Bassett-Lowke O Scale Track

+SUBCONTENTS Bassett-Lowke O Scale - Straight Track

+TURNOUT O "Bassett-Lowke O Scale	36"" (914.4mm) Straight	S36"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 36.0000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 36.000000 0.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	30"" (762mm) Straight	S30"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 30.0000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 30.000000 0.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	24"" (457.2mm) Straight	S24"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 24.0000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 24.000000 0.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	18"" (609.6mm) Straight	S18"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 18.0000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 18.000000 0.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	12"" (304.8mm) Straight	S12"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 12.0000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 12.000000 0.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	6"" (152.4mm) Straight	S6"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 6.0000000 0.000000 90.000000

+	S 0 0 0.000000 0.000000 6.000000 0.000000

+	END

+SUBCONTENTS Bassett-Lowke O Scale - Curve Track

+TURNOUT O "Bassett-Lowke O Scale	36"" (898.4mm) 30d Curve	C36"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 17.685026 4.738684 60.000000

+	C 0 0.000000 -35.370079 0.000000 35.370079 150.000000 30.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	39"" (990.4mm) 30d Curve	C39"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 19.496048 5.223946 60.000000

+	C 0 0.000000 -38.992126 0.000000 38.992126 150.000000 30.000000

+	END

+

+SUBCONTENTS Bassett-Lowke O Scale - Turnouts

+TURNOUT O "Bassett-Lowke O Scale	18""/457.2mm 30d Left Turnout	LTC"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 18.000000 0.000000 90.000000

+	E 17.685026 4.738684 60.000000

+	S 0 0 0.000000 0.000000 18.000000 0.000000

+	C 0 0.000000 35.370079 0.000000 35.370079 150.000000 30.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	18""/457.2mm 30d Right Turnout	RTC"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 18.000000 0.000000 90.000000

+	E 17.685026 -4.738684 120.000000

+	S 0 0 0.000000 0.000000 18.000000 0.000000

+	C 0 0.000000 35.370079 0.000000 -35.370079 0.000000 30.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	18""/457.2mm 15d Left Turnout	LTS"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 18.000000 0.000000 90.000000

+	E 9.154442 1.205204 75.000000

+	S 0 0 0.000000 0.000000 18.000000 0.000000

+	C 0 0.000000 35.370079 0.000000 35.370079 165.000000 15.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	18""/457.2mm 15d Right Turnout	RTS"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 18.000000 0.000000 90.000000

+	E 9.154442 -1.205204 105.000000

+	S 0 0 0.000000 0.000000 18.000000 0.000000

+	C 0 0.000000 35.370079 0.000000 -35.370079 0.000000 15.000000

+	END

+TURNOUT O "Bassett-Lowke O Scale	Three-Way Turnout(need to find data)	TWT"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	Z 0 0.000000 0.000000 0.000000 0 72.000000 "Future Addition - Need to find Data"

+	END

+TURNOUT O "Bassett-Lowke O Scale	Wye Turnout(need to find data)	WYE"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	Z 0 0.000000 0.000000 0.000000 0 72.000000 "Future Addition - Need to find Data"

+	END

+

+SUBCONTENTS Bassett-Lowke O Scale - Crossovers

+TURNOUT O "Bassett-Lowke O Scale	24""/609.6mm Double Crossover	DCO"

+	P "Normal" 1 2 3 0 4 5 6

+	P "Reverse" 1 7 8 9 6 0 4 10 11 12 3

+	E 0.000000 0.000000 270.000000

+	E 24.000000 0.000000 90.000000

+	E 0.000000 3.000000 270.000000

+	E 24.000000 3.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 2.294740 0.000000

+	S 0 0.000000 2.294740 0.000000 21.705260 0.000000

+	S 0 0.000000 21.705260 0.000000 24.000000 0.000000

+	S 0 0.000000 0.000000 3.000000 2.294740 3.000000

+	S 0 0.000000 2.294740 3.000000 21.705260 3.000000

+	S 0 0.000000 21.705260 3.000000 24.000000 3.000000

+	C 0 0.000000 -31.626858 2.294782 31.626858 164.407100 15.592976

+	S 0 0.000000 10.796087 1.164008 13.203913 1.835992

+	C 0 0.000000 31.626858 21.705301 -28.626847 344.407100 15.592976

+	C 0 0.000000 31.626858 2.294614 -28.626858 0.000076 15.592976

+	S 0 0.000000 10.796087 1.835992 13.203913 1.164008

+	C 0 0.000000 -31.626858 21.705301 31.626847 180.000076 15.592976

+	END

+TURNOUT O "Bassett-Lowke O Scale	24""/609.6mm Left Crossover	LCO"

+	P "Normal" 1 2 0 3 4

+	P "Reverse" 1 5 6 7 4

+	E 0.000000 0.000000 270.000000

+	E 24.000000 0.000000 90.000000

+	E 0.000000 3.000000 270.000000

+	E 24.000000 3.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 2.294740 0.000000

+	S 0 0.000000 2.294740 0.000000 24.000000 0.000000

+	S 0 0.000000 0.000000 3.000000 21.705260 3.000000

+	S 0 0.000000 21.705260 3.000000 24.000000 3.000000

+	C 0 0.000000 -31.626858 2.294782 31.626858 164.407100 15.592976

+	S 0 0.000000 10.796087 1.164008 13.203913 1.835992

+	C 0 0.000000 31.626858 21.705301 -28.626847 344.407100 15.592976

+	END

+TURNOUT O "Bassett-Lowke O Scale	24""/609.6mm Right Crossover	RCO"

+	P "Normal" 1 2 0 3 4

+	P "Reverse" 3 5 6 7 2

+	E 0.000000 0.000000 270.000000

+	E 24.000000 0.000000 90.000000

+	E 0.000000 3.000000 270.000000

+	E 24.000000 3.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 21.705260 0.000000

+	S 0 0.000000 21.705260 0.000000 24.000000 0.000000

+	S 0 0.000000 0.000000 3.000000 2.294740 3.000000

+	S 0 0.000000 2.294740 3.000000 24.000000 3.000000

+	C 0 0.000000 31.626858 2.294614 -28.626858 0.000076 15.592976

+	S 0 0.000000 10.796087 1.835992 13.203913 1.164008

+	C 0 0.000000 -31.626858 21.705301 31.626847 180.000076 15.592976

+	END

+

+SUBCONTENTS Bassett-Lowke O Scale - Parallel Turnouts

+TURNOUT O "Bassett-Lowke O Scale	24""/609.6mm Left Parallel Turnout	LTP"

+	P "Normal" 1 2

+	P "Reverse" 1 4 5 6 3

+	E 0.000000 0.000000 270.000000

+	E 24.000000 0.000000 90.000000

+	E 24.000000 3.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 2.294740 0.000000

+	S 0 0.000000 2.294740 0.000000 24.000000 0.000000

+	S 0 0.000000 21.705260 3.000000 24.000000 3.000000

+	C 0 0.000000 -31.626858 2.294782 31.626858 164.407100 15.592976

+	S 0 0.000000 10.796087 1.164008 13.203913 1.835992

+	C 0 0.000000 31.626858 21.705301 -28.626847 344.407100 15.592976

+	END

+TURNOUT O "Bassett-Lowke O Scale	24""/609.6mm Right Parallel Turnout	RTP"

+	P "Normal" 1 2

+	P "Reverse" 3 4 5 6 2

+	E 0.000000 0.000000 270.000000

+	E 24.000000 0.000000 90.000000

+	E 0.000000 3.000000 270.000000

+	S 0 0.000000 0.000000 0.000000 21.705260 0.000000

+	S 0 0.000000 21.705260 0.000000 24.000000 0.000000

+	S 0 0.000000 0.000000 3.000000 2.294740 3.000000

+	C 0 0.000000 31.626858 2.294614 -28.626858 0.000076 15.592976

+	S 0 0.000000 10.796087 1.835992 13.203913 1.164008

+	C 0 0.000000 -31.626858 21.705301 31.626847 180.000076 15.592976

+	END

+

+SUBCONTENTS Bassett-Lowke O Scale - Crossing

+TURNOUT O "Bassett-Lowke O Scale	Long Crossing(need to find data)	DLC"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	Z 0 0.000000 0.000000 0.000000 0 72.000000 "Future Addition - Need to find Data"

+	END