Merge branch 'release/debian/1%5.2.0Beta2.1-1' into masterHEADdebian/1%5.2.0Beta2.1-1master

1 files changed, 0 insertions, 401 deletions

diff --git a/app/lib/params/mrklnhok.xtp b/app/lib/params/mrklnhok.xtp
deleted file mode 100644
index 98f6f9f..0000000
--- a/app/lib/params/mrklnhok.xtp
+++ /dev/null
@@ -1,401 +0,0 @@
-CONTENTS Märklin K-Track HO-Scale
-# From 'Märklin Complete Program 1994/95 E'
-# Straight Section Design by Dave Bullis - 7.086614
-TURNOUT HO  "Märklin K-Track	Straight 180mm	2200"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 7.086614 0.000000 90.000000
-	S 0 0 0.000000 0.000000 7.087000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Straight 168.9mm	2206"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.649606 0.000000 90.000000
-	S 0 0 0.000000 0.000000 6.650000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Straight 217.9mm	2209"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 8.578740 0.000000 90.000000
-	S 0 0 0.000000 0.000000 8.579000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Straight 156mm	2207"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.141732 0.000000 90.000000
-	S 0 0 0.000000 0.000000 6.142000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Straight 90mm	2201"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.543307 0.000000 90.000000
-	S 0 0 0.000000 0.000000 3.543000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Straight 45mm	2202"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.771654 0.000000 90.000000
-	S 0 0 0.000000 0.000000 1.772000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Straight 41.3mm	2293"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.625984 0.000000 90.000000
-	S 0 0 0.000000 0.000000 1.626000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Straight 35.1mm	2208"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.381890 0.000000 90.000000
-	S 0 0 0.000000 0.000000 1.382000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Straight 30mm	2203"
-	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.181000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Straight 22.5mm	2204"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 0.885827 0.000000 90.000000
-	S 0 0 0.000000 0.000000 0.886000 0.000000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 295.4mm 45°	2210"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 8.223596 -3.406325 135.000000
-	C 0 0 11.630000 0.000000 -11.630000 0.000000 45.000000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 360mm 30°	2221"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 7.086614 -1.898853 120.000000
-	C 0 0 14.173000 0.000000 -14.173000 0.000000 30.000000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 360mm 15°	2223"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.668301 -0.482941 105.000000
-	C 0 0 14.173000 0.000000 -14.173000 0.000000 15.000000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 360mm 7.5°	2224"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.849978 -0.121254 97.500000
-	C 0 0 14.173000 0.000000 -14.173000 0.000000 7.500000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 424.6mm 30°	2231"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 8.358268 -2.239591 120.000000
-	C 0 0 16.717000 0.000000 -16.717000 0.000000 30.000000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 424.6mm 22.5°	2232"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.397141 -1.272470 112.500000
-	C 0 0 16.717000 0.000000 -16.717000 0.000000 22.500000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 424.6mm 15°	2233"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 4.326558 -0.569602 105.000000
-	C 0 0 16.717000 0.000000 -16.717000 0.000000 15.000000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 424.6mm 7.5°	2234"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 2.181946 -0.143012 97.500000
-	C 0 0 16.717000 0.000000 -16.717000 0.000000 7.500000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 424.6mm 3.75°	2235"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 1.093314 -0.035791 93.750000
-	C 0 0 16.717000 0.000000 -16.717000 0.000000 3.750000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 553.9 30°	2241"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 10.903543 -2.921596 120.000000
-	C 0 0 21.807000 0.000000 -21.807000 0.000000 30.000000
-	END
-TURNOUT HO  "Märklin K-Track	Curved 618.5 30°	2251"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 12.175197 -3.262334 120.000000
-	C 0 0 24.350000 0.000000 -24.350000 0.000000 30.000000
-	END
-TURNOUT HO  "Märklin K-Track	Left Turnout R424.6mm	2262"
-	P "Normal" 1
-	P "Reverse" 2
-	E 0.000000 0.000000 270.000000
-	E 6.649606 0.000000 90.000000
-	E 6.397141 1.272470 67.500000
-	S 0 0 0.000000 0.000000 6.650000 0.000000
-	C 0 0 -16.717000 0.000000 16.717000 157.500000 22.500000
-	END
-TURNOUT HO  "Märklin K-Track	Right Turnout R424.6mm	2263"
-	P "Normal" 1
-	P "Reverse" 2
-	E 0.000000 0.000000 270.000000
-	E 6.649606 0.000000 90.000000
-	E 6.397141 -1.272470 112.500000
-	S 0 0 0.000000 0.000000 6.650000 0.000000
-	C 0 0 16.717000 0.000000 -16.717000 0.000000 22.500000
-	END
-TURNOUT HO  "Märklin K-Track	Left Manual Turnout R424.6mm	2265"
-	P "Normal" 1
-	P "Reverse" 2
-	E 0.000000 0.000000 270.000000
-	E 6.649606 0.000000 90.000000
-	E 6.397141 1.272470 67.500000
-	S 0 0 0.000000 0.000000 6.650000 0.000000
-	C 0 0 -16.717000 0.000000 16.717000 157.500000 22.500000
-	END
-TURNOUT HO  "Märklin K-Track	Right Manual Turnout R424.6mm	2266"
-	P "Normal" 1
-	P "Reverse" 2
-	E 0.000000 0.000000 270.000000
-	E 6.649606 0.000000 90.000000
-	E 6.397141 -1.272470 112.500000
-	S 0 0 0.000000 0.000000 6.650000 0.000000
-	C 0 0 16.717000 0.000000 -16.717000 0.000000 22.500000
-	END
-# Double Slipswitch Design by Dave Bullis - 6.649606 22.500000 6.649606
-TURNOUT HO  "Märklin K-Track	22.5° Double Slip	2260"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
-	E 0.000000 0.000000 270.000000
-	E 6.649606 0.000000 90.000000
-	E 0.253086 1.272347 292.500000
-	E 6.396520 -1.272347 112.500000
-	S 0 0 0.000000 0.000000 1.297000 0.000000
-	S 0 0 1.297000 0.000000 5.352000 0.000000
-	S 0 0 5.352000 0.000000 6.650000 0.000000
-	S 0 0 0.253000 1.272000 1.452000 0.776000
-	S 0 0 1.452000 0.776000 5.198000 -0.776000
-	S 0 0 5.198000 -0.776000 6.397000 -1.272000
-	C 0 0 10.193000 1.297000 -10.193000 0.000000 22.500000
-	C 0 0 -10.193000 5.352000 10.193000 180.000000 22.500000
-	END
-# Crossing Design by Dave Bullis - 6.649606 22.500000 6.649606
-TURNOUT HO  "Märklin K-Track	22.5° Crossing	2259"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 6.649606 0.000000 90.000000
-	E 0.253086 1.272347 292.500000
-	E 6.396520 -1.272347 112.500000
-	S 0 0 0.000000 0.000000 6.650000 0.000000
-	S 0 0 0.253000 1.272000 6.397000 -1.272000
-	END
-# Crossing Design by Dave Bullis - 3.543307 45.000000 3.543307
-TURNOUT HO  "Märklin K-Track	45° Crossing	2258"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 3.543307 0.000000 90.000000
-	E 0.518905 1.252748 315.000000
-	E 3.024402 -1.252748 135.000000
-	S 0 0 0.000000 0.000000 3.543000 0.000000
-	S 0 0 0.519000 1.253000 3.024000 -1.253000
-	END
-TURNOUT HO  "Märklin K-Track	Right Curved Turnout	2269"
-	P "Normal" 1 2
-	P "Reverse" 3
-	E 0.000000 0.000000 270.000000
-	E 9.629921 -1.898853 120.000000
-	E 7.086614 -1.898853 120.000000
-	S 0 0 0.000000 0.000000 2.543000 0.000000
-	C 0 0 14.173000 2.543000 -14.173000 0.000000 30.000000
-	C 0 0 14.173000 0.000000 -14.173000 0.000000 30.000000
-	END
-TURNOUT HO  "Märklin K-Track	Left Curved Turnout	2268"
-	P "Normal" 1 2
-	P "Reverse" 3
-	E 0.000000 0.000000 270.000000
-	E 9.629921 1.898853 60.000000
-	E 7.086614 1.898853 60.000000
-	S 0 0 0.000000 0.000000 2.543000 0.000000
-	C 0 0 -16.717000 1.866000 16.703000 152.324000 25.352000
-	C 0 0 -14.173000 0.000000 14.173000 150.000000 30.000000
-	END
-TURNOUT HO  "Märklin K-Track	3-Way Turnout	2270"
-	P "Normal" 1
-	P "Right" 2
-	P "Left" 3
-	E 0.000000 0.000000 270.000000
-	E 6.649606 0.000000 90.000000
-	E 6.397141 -1.272470 112.500000
-	E 6.397141 1.272470 67.500000
-	S 0 0 0.000000 0.000000 6.650000 0.000000
-	C 0 0 16.717000 0.000000 -16.717000 0.000000 22.500000
-	C 0 0 -16.717000 0.000000 16.717000 157.500000 22.500000
-	END
-TURNOUT HO  "Märklin K-Track	Large Right Turnout	2273"
-	P "Normal" 1
-	P "Reverse" 2
-	E 0.000000 0.000000 270.000000
-	E 8.858268 0.000000 90.000000
-	E 8.855363 -1.121310 104.433333
-	S 0 0 0.000000 0.000000 8.858000 0.000000
-	C 0 0 35.528000 0.000000 -35.528000 0.000000 14.433000
-	END
-TURNOUT HO  "Märklin K-Track	Large Left Turnout	2272"
-	P "Normal" 1
-	P "Reverse" 2
-	E 0.000000 0.000000 270.000000
-	E 8.858268 0.000000 90.000000
-	E 8.855363 1.121310 75.566667
-	S 0 0 0.000000 0.000000 8.858000 0.000000
-	C 0 0 -35.528000 0.000000 35.528000 165.567000 14.433000
-	END
-TURNOUT HO  "Märklin K-Track	Large Curve 902.4mm	2274"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 8.855363 -1.121310 104.433333
-	C 0 0 35.528000 0.000000 -35.528000 0.000000 14.433000
-	END
-# Double Slipswitch Design by Dave Bullis - 8.858268 14.433300 8.858368
-TURNOUT HO  "Märklin K-Track	Large Double Slip	2275"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
-	E 0.000000 0.000000 270.000000
-	E 8.858268 0.000000 90.000000
-	E 0.139742 1.103986 284.433330
-	E 8.718526 -1.103986 104.433300
-	S 0 0 0.000000 0.000000 1.297000 0.000000
-	S 0 0 1.297000 0.000000 7.561000 0.000000
-	S 0 0 7.561000 0.000000 8.858000 0.000000
-	S 0 0 0.140000 1.104000 1.396000 0.781000
-	S 0 0 1.396000 0.781000 7.462000 -0.781000
-	S 0 0 7.462000 -0.781000 8.719000 -1.104000
-	C 0 0 24.734000 1.297000 -24.734000 0.000000 14.433000
-	C 0 0 -24.734000 7.561000 24.734000 180.000000 14.433000
-	END
-# Crossing Design by Dave Bullis - 8.858268 14.433330 8.858268
-TURNOUT HO  "Märklin K-Track	Large 14.433 Crossing	2257"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 8.858268 0.000000 90.000000
-	E 0.139791 1.103976 284.433330
-	E 8.718477 -1.103976 104.433330
-	S 0 0 0.000000 0.000000 8.858000 0.000000
-	S 0 0 0.140000 1.104000 8.718000 -1.104000
-	END
-TURNOUT HO "Märklin K-Track	Straight Uncoupler 90mm	2297"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.543307 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 3.543307 0.000000
-	F 0 0.000000 4
-		0.666667 -0.090000
-		2.876640 -0.090000
-		2.876640 0.080000
-		0.666667 0.080000
-	END
-TURNOUT HO "Märklin K-Track	Straight Circuit 90mm	2299"
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.543307 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 3.543307 0.000000
-	G 16711680 0.000000 0.400000 1.77000 0.000000 
-	END
-TURNOUT HO "Märklin K-Track	Curved Circuit R=360mm 15°	2229"
-	U "Curved Section" "" "Märklin K-Track" "Bogen Kontaktgleis-Schleifer" "2229" 6.581313 15.000000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.668301 -0.482941 105.000000
-	C 0 0 14.173228 0.000000 -14.173228 0.000000 15.000000
-	G 16711680 0.000000 0.400000 1.834150 -0.121254
-	END
-TURNOUT HO "Märklin K-Track	Curved Circuit R=424.6mm 15°	2239"
-	U "Curved Section" "" "Märklin K-Track" "Bogen Kontaktgleis Schleifer" "2239" 6.581313 15.000000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 4.326558 -0.569602 105.000000
-	C 0 0 16.717000 0.000000 -16.717000 0.000000 15.000000
-	G 16711680 0.0000000 0.400000 2.163279 -0.143016
-	END
-TURNOUT HO "Märklin K-Track	Lighted Bumper 38mm	7389"
-	U "Straight Section" "" "Märklin K-Track" "Prellbock beleuchtet" "7389" 0.589001 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	S 0 0.000000 0.000000 0.000000 1.496063 0.000000
-	F 8421504 0.026667 4
-		0.748031 -0.769333
-		1.500000 -0.769333
-		1.500000 0.769333
-		0.748031 0.769333
-	G 16711680 0.000000 0.300000 0.800000 0.00000
-	END
-TURNOUT HO "Märklin K-Track	Bumper 38mm	7391"
-	U "Straight Section" "" "Märklin K-Track" "Prellbock" "7391" 0.589001 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	S 0 0.000000 0.000000 0.000000 1.496063 0.000000
-	F 8421504 0.026667 4
-		0.748031 -0.769333
-		1.500000 -0.769333
-		1.500000 0.769333
-		0.748031 0.769333
-	END
-TURNOUT HO "Märklin K-Track	Straight Feeder	2290"
-	U "Straight Section" "Dave Bullis" "Märklin K-Track" "Straight Feeder" "2290" 7.086614 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 7.086614 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 7.086614 0.000000
-	F3 12566463 0.000000 4
-		3.986220 0.314961 0
-		3.100394 0.314961 0
-		3.248031 0.708661 0
-		3.838583 0.708661 0
-	G3 0 0.000000 0.078740 3.395669 0.551181 0
-	G3 0 0.000000 0.078740 3.690945 0.551181 0
-	END
-TURNOUT HO "Märklin K-Track	Straight K to M Adapter	2291"
-	U "Straight Section" "Dave Bullis" "Märklin K-Track" "Straight K to M Adapter" "2291" 7.086614 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 7.086614 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 7.086614 0.000000
-	END
-TURNOUT HO "Märklin K-Track	Straight Feeder w/ Capacitor	2292"
-	U "Straight Section" "Dave Bullis" "Märklin K-Track" "Straight Feeder w/ Capacitor" "2292" 7.086614 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 7.086614 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 7.086614 0.000000
-	F3 12566463 0.000000 4
-		3.986220 0.314961 0
-		3.100394 0.314961 0
-		3.248031 0.708661 0
-		3.838583 0.708661 0
-	G3 0 0.000000 0.078740 3.395669 0.551181 0
-	G3 0 0.000000 0.078740 3.690945 0.551181 0
-	L3 0 0.040000 3.543307 0.314961 0 3.543307 0.078740 0
-	L3 0 0.040000 3.543307 -0.314961 0 3.543307 -0.078740 0
-	L3 0 0.040000 3.248031 0.078740 0 3.838583 0.078740 0
-	L3 0 0.040000 3.248031 -0.078740 0 3.838583 -0.078740 0
-	END
-TURNOUT HO "Märklin K-Track	Contact Set	2295"
-	U "Straight Section" "Dave Bullis" "Märklin K-Track" "Contact Set" "2295" 7.086614 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 7.086614 0.000000 90.000000
-	S 0 0.000000 0.000000 0.000000 7.086614 0.000000
-	F3 12566463 0.000000 4
-		6.496063 0.314961 0
-		6.496063 0.708661 0
-		6.200787 0.708661 0
-		6.200787 0.314961 0
-	F3 12566463 0.000000 4
-		4.133858 0.314961 0
-		4.133858 0.708661 0
-		4.429134 0.708661 0
-		4.429134 0.314961 0
-	G3 0 0.000000 0.078740 4.281496 0.551181 0
-	G3 0 0.000000 0.078740 6.348425 0.551181 0
-	L3 0 0.040000 3.543307 0.393701 0 3.543307 -0.393701 0
-	END