Skip to content
This repository has been archived by the owner on Jul 9, 2023. It is now read-only.

Verbesserung der Pariser Knoten #748

Open
wants to merge 43 commits into
base: main
Choose a base branch
from
Open

Verbesserung der Pariser Knoten #748

wants to merge 43 commits into from

Conversation

GeorgesBenisty
Copy link

Nach Prüfung der map_plot (danke an der C1710 plot.py Tool), sollte es keine Error.
Es ist richtig, dass der Pariser Knotten sehr kompliziert in der Realität ist, und dass möchte ich in der Spiel bringen.
Man kann man immer diskutieren, welche Teile löschen oder geändert wenn es zu komplex in der Spiel zu laden.

Haupt-Verbesserung :

  • Klassiche Netzwerk im Pariser Vororten verbessern (siehe Issue Verbesserung der Pariser Vororten, bzw. Pariser Knoten #725 Beschreibung)
  • Aufträge verbessert (Transilien und RER unterschiedet, OTC mit realistiche Halten)
  • Der TGV Marseille Le Havre (u. bzw. Le Havre Marseille) hat realistiche Halten (meistens zwischen Rouen Rive Droite und Lyon Part Dieu mit Mantes la Jolie Versailles Chantiers und Massy Palaiseau)
  • Keine existierte Aufträge gelöscht

@GeorgesBenisty
Create .Rhistory
7b5bd52
@GeorgesBenisty
Merge branch 'main' of https://github.com/marhei/TrainCompany-Data
1447212
@GeorgesBenisty
Strecke zwischen Epone Mezieres und Versailles Chantiers
0a3cb11 
Fixes marhei#725
@GeorgesBenisty
Strecke zwischen Epone Mezieres und Versailles Chantiers
0819135 
Fixes marhei#725
@GeorgesBenisty
Strecke zwischen Epone Mezieres und Versailles Chantiers
91be658 
Fixes marhei#725
@GeorgesBenisty
modified: Path.json
28d2a0a 
	modified:   Station.json
@GeorgesBenisty
Rund auf Paris verbessern
32d3180 
Fixes marhei#725
@GeorgesBenisty
Verbesserung der Pariser Vororten, bzw. Pariser Knoten
5fac6c8 
Fixes marhei#725
@GeorgesBenisty
modified: Station.json
e1519e5
@GeorgesBenisty
modified: Path.json
f4ee236 
	modified:   Station.json
@GeorgesBenisty
modified: Path.json
2f08e33
@GeorgesBenisty
modified: Path.json
3774e73 
	modified:   Station.json
@GeorgesBenisty
modified: Path.json
937615a 
	modified:   Station.json
	modified:   TaskModel.json
@GeorgesBenisty
Verbesserung der Pariser Vororten, bzw. Pariser Knoten
a4a4415 
Fixes marhei#725
@GeorgesBenisty
modified: Path.json
37a622c 
	modified:   TaskModel.json
@GeorgesBenisty
modified: Path.json
7e68bcb 
	modified:   Station.json
	modified:   TaskModel.json
@GeorgesBenisty
modified: TaskModel.json
6631ea0
@GeorgesBenisty
modified: TaskModel.json
c588e3d
@GeorgesBenisty
modified: Path.json
4b39147 
	modified:   TaskModel.json
@GeorgesBenisty
modified: TaskModel.json
2633b90
@GeorgesBenisty
Verbesserung der Pariser Vororten, bzw. Pariser Knoten
55ddcd1 
Fixes marhei#725
@GeorgesBenisty
Kleine Anderung, nach Prüfung der map_plot.svg
a97d0a9
@GeorgesBenisty
- Bahnof Corbeil Essones zwsichen Juvisy und Melun hinzugefugt
6d9db3b 
- Alle Aufträge an der RER D weiter gebaut mit diese Bahnof
- Aufträge der OTC zwischen Paris und Nantes verbesserrt (abfhart PAZ, eine Variante über Tours und eine Variante über Versailles)
@GeorgesBenisty
Finale Anderung an der Corbeil Essonnes Bf.
7b15c6c
@marhei
Copy link
Owner

marhei commented Sep 22, 2022

Hey, danke für deine Mühe. Derzeit hast du Konflikte in deinem PR die erstmal gelöst werden müssen. Anschließend schaue ich mir das gerne mal genauer an, ich bin aber derzeit im Urlaub deswegen kann das etwas dauert.

GeorgesBenisty and others added 5 commits September 25, 2022 09:33
@GeorgesBenisty
Ausprobierung, der Konflikt zu lösen
65f8a6a
@GeorgesBenisty
Ausprobierung, meine Konflikt zu lösen
be62dfa 
Fixes marhei#725
@GeorgesBenisty
Merge branch 'marhei:main' into main
e1f7532
@GeorgesBenisty
Merge branch 'main' of https://github.com/GeorgesBenisty/TrainCompany…
98aeb2e 
…-Data
@GeorgesBenisty
Squashed commit of the following:
f2200de 
commit 98aeb2e
Merge: 65f8a6a e1f7532
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Sun Sep 25 09:53:57 2022 +0200

    Merge branch 'main' of https://github.com/GeorgesBenisty/TrainCompany-Data

commit e1f7532
Merge: 1447212 7b2c9df
Author: GeorgesBenisty <76108903+GeorgesBenisty@users.noreply.github.com>
Date:   Sun Sep 25 09:50:53 2022 +0200

    Merge branch 'marhei:main' into main

commit 65f8a6a
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Sun Sep 25 09:33:43 2022 +0200

    Ausprobierung, der Konflikt zu lösen

commit 7b2c9df
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sat Sep 24 20:11:37 2022 +0100

    Unnötige Vererbung entfernt

commit fbcc6cb
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sat Sep 24 20:10:46 2022 +0100

    Korrekturen

commit 84b8c4f
Merge: f3c5b1b c007eef
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sat Sep 24 20:08:05 2022 +0100

    Merge pull request marhei#750 from Emuricdo/main

commit c007eef
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 24 00:59:40 2022 +0200

    Update TaskModel.json

commit dc5360f
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 24 00:12:03 2022 +0200

    Update TaskModel.json

commit e3c5768
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 24 00:07:49 2022 +0200

    Update TaskModel.json

commit d5db463
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 24 00:05:10 2022 +0200

    Update TaskModel.json

commit 932d6b1
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Fri Sep 23 23:57:36 2022 +0200

    Update TaskModel.json

commit f3c5b1b
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Tue Sep 20 21:01:49 2022 +0200

    Vmax 193 auf 230 km/h erhöht

commit 53a9722
Merge: ef09152 0f7a144
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Mon Sep 19 20:35:22 2022 +0200

    Merge pull request marhei#747 from embix/demote-karlovpodjestedem

    minor fixes for recent PR Norden Tschechien

commit 0f7a144
Author: Michel Bretschneider <embix@gmx.net>
Date:   Mon Sep 19 16:54:09 2022 +0200

    fix path suggestions for jobs passing Mittelherwigsdorf(Sachs)

commit 820fc13
Author: Michel Bretschneider <embix@gmx.net>
Date:   Mon Sep 19 16:51:19 2022 +0200

    demote karlovpodjestedem - too close to other route

commit ef09152
Merge: 78bcada 43ffec8
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sun Sep 18 21:59:51 2022 +0200

    Merge pull request marhei#746 from embix/route-zittau-liberec

    Routen im Norden Tschechiens

commit 78bcada
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sun Sep 18 21:56:53 2022 +0200

    Zur Wahrung der übersichtlichkeit Verbindung von XTPAN nach XTKLP entfernt

commit f0df436
Merge: d19841f d7083e1
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sun Sep 18 21:50:03 2022 +0200

    Merge pull request marhei#745 from embix/route-rumburk-mikulasovice

    Routes Rumburk-Pansky-Mikulasovice, Pansky-Krasna Lipa

commit 43ffec8
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sun Sep 18 18:42:50 2022 +0200

    stations/route Mittelherwigsdorf(Sachs)-Rybniste

commit 2658f33
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sun Sep 18 18:04:00 2022 +0200

    stations/route Ceska Lipa - Benesov nad Ploucnici

commit dbbefe2
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sun Sep 18 17:14:56 2022 +0200

    stations/route ceska lipa - jedlova

commit 22e79a6
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sun Sep 18 16:28:35 2022 +0200

    route/stations Liberec-CeskaLipa

commit 238cd85
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sun Sep 18 14:41:58 2022 +0200

    add stations/route Zittau-Liberec

commit d7083e1
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sun Sep 18 13:27:19 2022 +0200

    +jobs Rumburk-Pansky-(KransaLipa)-Mikulasovice

commit d6fff9e
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sun Sep 18 13:19:22 2022 +0200

    stations/route pansky-krasnalipa

commit d61e9b5
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sun Sep 18 13:00:49 2022 +0200

    +route/stations rumburk-pansky-mikulasovice

commit d19841f
Merge: 8aeef36 cbd7331
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sat Sep 17 23:41:09 2022 +0200

    Merge pull request marhei#742 from embix/jobs-nossen-freiberg-holzhau

    Jobs nossen freiberg holzhau

commit 8aeef36
Merge: 3c4e800 fabef11
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sat Sep 17 23:37:03 2022 +0200

    Merge pull request marhei#744 from karlbeecken/patch-4

    fix PNT/PON bug

commit fabef11
Author: Karl Beecken <karl@beecken.berlin>
Date:   Sat Sep 17 19:49:31 2022 +0200

    fix PNT/PON bug

commit cbd7331
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 17 15:38:48 2022 +0200

    fix route and suggestion

commit e3ac9aa
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 17 15:21:47 2022 +0200

    +job RB 83 Freiberg-Holzhau

commit 1259336
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 17 15:18:31 2022 +0200

    fix pathSuggestions Plaue-Erfurt

commit 8e2e804
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 17 15:15:56 2022 +0200

    fix pathSuggestions Gotha-Erfurt

commit 4823f7f
Author: TrainCompany <train-company@c1710.de>
Date:   Sat Sep 17 13:11:54 2022 +0000

    Projected coordinates

commit 4a55f31
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 17 15:11:09 2022 +0200

    overhaul route Gotha-Erfurt

commit fc1baf5
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 17 14:57:55 2022 +0200

    promote Holzhau, demote Holzhau Skilift

commit 3906a69
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 17 14:51:49 2022 +0200

    +job Eisenbahnfreunde Nossen nach Arnsdorf

commit 512f8b9
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 17 14:46:40 2022 +0200

    overhaul route Plaue-Erfurt

commit 5beac56
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 17 14:36:03 2022 +0200

    +job Eisenbahnfreunde Nossen nach Holzhau

commit 3c4e800
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sat Sep 17 12:12:44 2022 +0200

    Korrekturen bei den Netzwerken

commit 162537e
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sat Sep 17 09:55:30 2022 +0200

    Fehlerhafte PathSuggestion korrigiert

commit 9e12c35
Merge: 38c8bd3 71c81e5
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sat Sep 17 09:53:39 2022 +0200

    Merge pull request marhei#741 from Emuricdo/main

    Nightstar

commit 71c81e5
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sat Sep 17 09:51:36 2022 +0200

    Update DelayModel.json

    Syntax-Fehler behoben

commit 0cbe599
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Fri Sep 16 23:26:48 2022 +0200

    Update TaskModel.json

commit c09c865
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Fri Sep 16 23:21:07 2022 +0200

    Update TaskModel.json

commit 6e5fdac
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Fri Sep 16 23:18:11 2022 +0200

    Update TaskModel.json

commit 676af53
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Fri Sep 16 23:12:36 2022 +0200

    Update TaskModel.json

commit 8024412
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Fri Sep 16 23:07:00 2022 +0200

    Update TaskModel.json

commit 472b5ab
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Fri Sep 16 23:02:15 2022 +0200

    zusätzliche Verspätungen

commit f83378d
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Fri Sep 16 22:28:48 2022 +0200

    Anpassung Name Renaissance/Nightstar-Wagen

commit 2e64f53
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Fri Sep 16 22:26:14 2022 +0200

    Nightstar-Aufträge

commit 38c8bd3
Merge: fa855bb 0671a7a
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Thu Sep 15 09:28:12 2022 +0200

    Merge pull request marhei#740 from ChillLP/patch-ICE-L

    Removed some Vehicles from ICE-L and added 248

commit 0671a7a
Author: León <105374102+ChillLP@users.noreply.github.com>
Date:   Wed Sep 14 21:51:57 2022 +0200

    Removed some Vehicles from ICE-L and added 248

commit fa855bb
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Tue Sep 13 13:40:42 2022 +0200

    Texas Eagle korregiert (closes marhei#738)

commit 16b0801
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Tue Sep 13 10:36:49 2022 +0200

    Einige unnötige Objets-Arrays entfernt

commit 82c1bd0
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Tue Sep 13 10:08:54 2022 +0200

    Anpassungen

commit 5a06fc2
Merge: 0e14b02 2a47a8b
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Tue Sep 13 10:07:49 2022 +0200

    Merge pull request marhei#737 from embix/route-zittau-goerlitz

    add route Neißetalbahn Zittau-Görlitz

commit 2a47a8b
Author: Michel Bretschneider <embix@gmx.net>
Date:   Mon Sep 12 20:49:24 2022 +0200

    +job ODEG RB65 Cottbus-Görlitz-Zittau

commit 89f6c54
Author: Michel Bretschneider <embix@gmx.net>
Date:   Mon Sep 12 20:30:35 2022 +0200

    add route Neißetalbahn Zittau-Görlitz

    related: marhei#481

commit 0e14b02
Merge: 4286167 129b125
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Mon Sep 12 13:15:37 2022 +0200

    Merge pull request marhei#735 from karlbeecken/patch-3

    add bistroseats to more ICs and ICEs

commit 4286167
Merge: 390630a c9891bc
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Mon Sep 12 13:14:07 2022 +0200

    Merge pull request marhei#736 from Moritz-Schmidt/patch-1

    Fixed Texas Eagle Auftrag

commit 129b125
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Mon Sep 12 13:13:32 2022 +0200

    Update TaskModel.json

    Bistroseats von IC2-Linie entfernt

commit c9891bc
Author: Moritz Schmidt <88738242+Moritz-Schmidt@users.noreply.github.com>
Date:   Mon Sep 12 11:42:05 2022 +0200

    Fixed Texas Eagle Auftrag

    Auftrag war unmöglich da manche Stationen nicht existieren, diese nicht existierenden Stationen habe ich aus dem Auftrag entfernt

commit 0a1f542
Author: Karl Beecken <karl@beecken.berlin>
Date:   Sun Sep 11 21:56:28 2022 +0200

    add bistroseats to more ICEs

commit 901d0e0
Author: Karl Beecken <karl@beecken.berlin>
Date:   Sun Sep 11 21:53:36 2022 +0200

    add bistroseats to more ICs

commit 390630a
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sun Sep 11 17:59:10 2022 +0200

    Parent-Netzwerk für iberisches Breitspurnetz gesetzt

commit 8ce7bda
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sun Sep 11 13:22:02 2022 +0200

    Fix Typo

commit e1b26b8
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sun Sep 11 10:03:49 2022 +0200

    Fix Typo

commit 56df189
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sun Sep 11 09:58:54 2022 +0200

    Korrekturen

commit b5122cb
Merge: bd251a3 d7377c7
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sun Sep 11 09:51:42 2022 +0200

    Merge pull request marhei#734 from Emuricdo/main

    nordamerikanisches Rollmaterial

commit bd251a3
Merge: 9def738 acad52d
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sun Sep 11 09:49:12 2022 +0200

    Merge pull request marhei#733 from C1710/titanic

    #AllTheLinesAmtrak

commit d7377c7
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sun Sep 11 04:31:54 2022 +0200

    US-Reisezugwagen

commit 59a0a31
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sun Sep 11 03:28:59 2022 +0200

    US-Triebzüge

commit 3fa10b6
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sun Sep 11 02:57:01 2022 +0200

    Hinzufügung N700S

    Hochgeschwindigkeitszug, um US-Schnellfahrstrecken mit höheren Geschwindigkeiten nutzen zu können
    Eigentlich sind die zwar für die Texas Central Railway vorgesehen, allerdings könnte es als Provisorium dienen, bis bekannt wird, welche Fahrzeuge auf der CHSR eingesetzt werden sollen

commit f3bf32a
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sun Sep 11 02:33:19 2022 +0200

    US-Güterwagen

commit fb81e11
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sun Sep 11 02:08:07 2022 +0200

    US-Elektrolokomotiven

commit 5d1dfab
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sun Sep 11 00:24:03 2022 +0200

    US-Diesellokomotiven für Personenzüge

commit b23acfd
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 23:09:25 2022 +0200

    US-Güterzuglokomotiven

commit acad52d
Author: Constantin A <git-user@c1710.de>
Date:   Sat Sep 10 22:11:33 2022 +0200

    Small twistingFactor fix

commit 91306f4
Merge: a549fe1 9def738
Author: Constantin A <git-user@c1710.de>
Date:   Sat Sep 10 21:58:47 2022 +0200

    Merge remote-tracking branch 'upstream/main' into titanic

commit a549fe1
Author: Constantin A <git-user@c1710.de>
Date:   Sat Sep 10 21:56:53 2022 +0200

    Add more (all?) remaining Amtrak services

commit d86fd86
Author: Constantin A <git-user@c1710.de>
Date:   Sat Sep 10 21:44:28 2022 +0200

    Add route for Ethan Allen

commit fe194ea
Author: Constantin A <git-user@c1710.de>
Date:   Sat Sep 10 21:42:31 2022 +0200

    Fix Burlington IA

commit 56b5cb9
Author: Constantin A <git-user@c1710.de>
Date:   Sat Sep 10 21:33:15 2022 +0200

    Add last Amtrak lines

commit 9def738
Merge: e3c30d3 4c104f2
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sat Sep 10 19:28:45 2022 +0200

    Merge pull request marhei#732 from Emuricdo/main

    zusätzliche Ausstattungen

commit ddee19a
Author: Constantin A <git-user@c1710.de>
Date:   Sat Sep 10 19:01:12 2022 +0200

    Add other stations/routes for Amtrak

commit 4c104f2
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 17:46:47 2022 +0200

    Update Train.json

commit 8841f9a
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 17:41:07 2022 +0200

    Update Train.json

commit 85e65e9
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 17:32:33 2022 +0200

    Update Train.json

commit 04f967e
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 17:30:04 2022 +0200

    Update Train.json

commit 4e52e12
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 17:29:27 2022 +0200

    Update Train.json

commit 465b2a6
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 17:12:05 2022 +0200

    Update Train.json

commit 3af472c
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 17:09:58 2022 +0200

    Hinzufügung LINT 27 und LINT 41

commit b025d97
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 16:59:31 2022 +0200

    zusätzliche Ausstattungen

commit e3c30d3
Merge: be44f60 01a7cb2
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sat Sep 10 16:57:32 2022 +0200

    Merge pull request marhei#731 from embix/fix-job-name

commit 01a7cb2
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 16:42:41 2022 +0200

    fix job name

commit e3e4ed3
Author: Constantin A <git-user@c1710.de>
Date:   Sat Sep 10 16:23:43 2022 +0200

    Correction for Gainesville (US-Georgia)

commit 95c43c7
Author: Constantin A <git-user@c1710.de>
Date:   Sat Sep 10 16:02:54 2022 +0200

    Add Lancaster code

commit be44f60
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sat Sep 10 15:28:05 2022 +0200

    PathSuggestions ergänzt

commit 2df74c0
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sat Sep 10 15:18:13 2022 +0200

    Kleinere Korrekturen
    �

commit 281c0b1
Merge: 2dc55b2 2ffa4b9
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sat Sep 10 15:16:08 2022 +0200

    Merge pull request marhei#730 from embix/route-adorf-zwotental

    Routen/Jobs Westl. Erzgebirge

commit 2ffa4b9
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 15:10:37 2022 +0200

    VBG RB5 Mehlteuer-Plauen-Kraslice-(Karlovy Vary)

commit be8551e
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 15:05:54 2022 +0200

    +job VBG RB1 Zwickau-Kraslice-(Karlovy Vary)

commit 0c195cf
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 15:01:03 2022 +0200

    Belarus-Nachrüstung einiger Diesellokomotiven

commit 33b0676
Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
Date:   Sat Sep 10 14:54:51 2022 +0200

    Hinzufügung 99.77-79, V200.1 und NOHAB AA16

commit 930f54d
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 14:51:56 2022 +0200

    fix: put CD Os and RB in group 2 (RB/RE)

commit 19ba771
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 14:46:43 2022 +0200

    add seasonal connection for RB80 to Chomutov

commit 9ade442
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 14:39:17 2022 +0200

    +job Sonderzug OVEB

commit bc90ad6
Merge: 570cb56 2dc55b2
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 14:22:28 2022 +0200

    Merge remote-tracking branch 'upstream/main' into route-adorf-zwotental

commit 570cb56
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 14:15:07 2022 +0200

    fix missing comma

commit 8c8ad1b
Author: TrainCompany <train-company@c1710.de>
Date:   Sat Sep 10 12:14:14 2022 +0000

    Projected coordinates

commit a0dccfe
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 14:13:35 2022 +0200

    add route/stations Muldenberg-Schönheide Ost

commit 2dc55b2
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sat Sep 10 13:51:42 2022 +0200

    Nordafrika ist nun eigenes Netz

commit f914cac
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 13:47:19 2022 +0200

    promote Mehltheuer according to actual status/infra

commit 338ca86
Author: TrainCompany <train-company@c1710.de>
Date:   Sat Sep 10 11:26:20 2022 +0000

    Projected coordinates

commit 62f28c1
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 13:25:41 2022 +0200

    add route/stations herlasgrün-falkenstein

commit a2d84df
Author: TrainCompany <train-company@c1710.de>
Date:   Sat Sep 10 10:25:28 2022 +0000

    Projected coordinates

commit fdd6be3
Author: Michel Bretschneider <embix@gmx.net>
Date:   Sat Sep 10 12:24:01 2022 +0200

    +Stations/Route Adorf-Zwotental

    related: marhei#481

commit f854bd7
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sat Sep 10 11:03:15 2022 +0200

    Fehlerhafte Zuordnung korrigiert

commit 1287ffe
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Sat Sep 10 10:03:11 2022 +0200

    Kleinere Korrekturen

commit 4dc8f66
Merge: e41f370 033cb61
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Sat Sep 10 10:00:23 2022 +0200

    Merge pull request marhei#729 from embix/route-zwickau-sokolov

    route Zwickau-Zwotental-Sokolov

commit 033cb61
Merge: f457bf4 e41f370
Author: Michel Bretschneider <embix@gmx.net>
Date:   Fri Sep 9 22:46:02 2022 +0200

    Merge remote-tracking branch 'upstream/main' into route-zwickau-sokolov

commit f457bf4
Author: Michel Bretschneider <embix@gmx.net>
Date:   Fri Sep 9 22:44:49 2022 +0200

    fix remaining stations

commit 31fe39c
Author: TrainCompany <train-company@c1710.de>
Date:   Fri Sep 9 20:26:25 2022 +0000

    Projected coordinates

commit b18a1c3
Author: Michel Bretschneider <embix@gmx.net>
Date:   Fri Sep 9 22:24:28 2022 +0200

    +routes/stations zwickau-sokolov

    related: marhei#481

commit d3aebea
Author: Constantin A <git-user@c1710.de>
Date:   Fri Sep 9 22:19:57 2022 +0200

    More Amtrak services

commit f90e4dd
Author: Constantin A <git-user@c1710.de>
Date:   Fri Sep 9 21:54:39 2022 +0200

    Add some new Amtrak routes

commit 4802238
Author: Constantin A <git-user@c1710.de>
Date:   Fri Sep 9 21:29:20 2022 +0200

    Add Lorton (Auto Train)

commit cf8b680
Author: Constantin A <git-user@c1710.de>
Date:   Fri Sep 9 21:03:15 2022 +0200

    small name change

commit f6cd935
Merge: f25a00d e41f370
Author: Constantin A <git-user@c1710.de>
Date:   Fri Sep 9 21:00:25 2022 +0200

    Merge remote-tracking branch 'upstream/main' into titanic

commit e41f370
Merge: 2ada6d8 f7bd2b0
Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
Date:   Fri Sep 9 19:53:35 2022 +0200

    Merge pull request marhei#728 from f2k1de/tgvtestfahrt

    Add TGV Testfahrt

commit f7bd2b0
Author: Isabelle <hi@f2k1.de>
Date:   Fri Sep 9 19:43:21 2022 +0200

    Add TGV Testfahrt

commit 2ada6d8
Author: Marcel Heisinger <marhei@users.noreply.github.com>
Date:   Thu Sep 8 20:30:20 2022 +0200

    Fix marhei#727

commit f25a00d
Merge: 925fc0f 5437e93
Author: Constantin A <git-user@c1710.de>
Date:   Mon Sep 5 22:47:55 2022 +0200

    Merge branch 'upstream-main' into titanic

    # Conflicts:
    #	Path.json
    #	Station.json

commit 925fc0f
Author: Constantin A <git-user@c1710.de>
Date:   Mon Sep 5 22:25:23 2022 +0200

    Add California High Speed Rail initial Operation State

commit 7c1b63a
Author: Constantin A <git-user@c1710.de>
Date:   Mon Sep 5 22:13:12 2022 +0200

    Central Valley Route Pt I

commit 0dfc36b
Author: Constantin A <git-user@c1710.de>
Date:   Mon Sep 5 21:37:19 2022 +0200

    Small fix for Silver Star

commit 0474022
Author: Constantin A <git-user@c1710.de>
Date:   Mon Sep 5 21:34:45 2022 +0200

    Part V of Southwest Chief route

commit 87f757b
Author: Constantin A <git-user@c1710.de>
Date:   Mon Sep 5 21:31:07 2022 +0200

    Part IV of Southwest Chief route

commit 812c563
Author: Constantin A <git-user@c1710.de>
Date:   Mon Sep 5 21:27:16 2022 +0200

    Part III of Southwest Chief route

commit 31d93e8
Author: Constantin A <git-user@c1710.de>
Date:   Mon Sep 5 21:24:15 2022 +0200

    Part II of Southwest Chief route

commit 0f911f4
Author: Constantin A <git-user@c1710.de>
Date:   Mon Sep 5 21:13:30 2022 +0200

    Add stations for Southwest Chief

commit 4f24ddc
Author: Constantin A <git-user@c1710.de>
Date:   Sun Sep 4 22:25:59 2022 +0200

    Add small route for Carolinian

commit aea1d77
Author: Constantin A <git-user@c1710.de>
Date:   Sun Sep 4 22:04:32 2022 +0200

    Pacific Surfliner route

commit b1ce567
Author: Constantin A <git-user@c1710.de>
Date:   Sun Sep 4 21:55:04 2022 +0200

    Another US route

commit 1bcdee6
Author: Constantin A <git-user@c1710.de>
Date:   Sun Sep 4 21:30:02 2022 +0200

    Change some station groups

commit df7de7e
Author: Constantin A <git-user@c1710.de>
Date:   Sun Sep 4 21:12:20 2022 +0200

    Corrections

commit 4a9726d
Author: Constantin A <git-user@c1710.de>
Date:   Sun Sep 4 20:48:51 2022 +0200

    Add some new US routes

commit ae113c5
Author: Constantin A <git-user@c1710.de>
Date:   Tue Aug 30 23:29:36 2022 +0200

    Add Missouri River Runner

commit 3b161ab
Author: Constantin A <git-user@c1710.de>
Date:   Tue Aug 30 23:27:46 2022 +0200

    Fix St Louis code

commit 452c77e
Author: Constantin A <git-user@c1710.de>
Date:   Tue Aug 30 23:24:26 2022 +0200

    Add route to Kansas

commit 9647b68
Author: Constantin A <git-user@c1710.de>
Date:   Tue Aug 30 23:20:52 2022 +0200

    Fix Cascades title

commit 915ad32
Author: Constantin A <git-user@c1710.de>
Date:   Tue Aug 30 22:51:05 2022 +0200

    add fixme

commit 281f138
Author: Constantin A <git-user@c1710.de>
Date:   Mon Aug 29 22:24:22 2022 +0200

    Add partial River Runner

commit f8bc714
Author: Constantin A <git-user@c1710.de>
Date:   Mon Aug 29 22:12:58 2022 +0200

    Add correct Lincoln & Springfield

commit 76a6a54
Author: Constantin A <git-user@c1710.de>
Date:   Mon Aug 29 22:08:09 2022 +0200

    Add rest of path to Austin

commit 75f6f82
Author: Constantin A <git-user@c1710.de>
Date:   Mon Aug 29 21:55:31 2022 +0200

    Chicago-San Antonio (stations)

commit 232de35
Author: Constantin A <git-user@c1710.de>
Date:   Mon Aug 29 21:18:56 2022 +0200

    Ad Toronto-Montreal

commit 2986664
Author: Constantin A <git-user@c1710.de>
Date:   Mon Aug 29 21:04:09 2022 +0200

    Update license entry for Canada
@GeorgesBenisty
Squashed commit of the following:
4f0fa2b 
commit f2200de
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Sun Sep 25 10:00:40 2022 +0200

    Squashed commit of the following:

    commit 98aeb2e
    Merge: 65f8a6a e1f7532
    Author: GeorgesBenisty <gbenisty@gmail.com>
    Date:   Sun Sep 25 09:53:57 2022 +0200

        Merge branch 'main' of https://github.com/GeorgesBenisty/TrainCompany-Data

    commit e1f7532
    Merge: 1447212 7b2c9df
    Author: GeorgesBenisty <76108903+GeorgesBenisty@users.noreply.github.com>
    Date:   Sun Sep 25 09:50:53 2022 +0200

        Merge branch 'marhei:main' into main

    commit 65f8a6a
    Author: GeorgesBenisty <gbenisty@gmail.com>
    Date:   Sun Sep 25 09:33:43 2022 +0200

        Ausprobierung, der Konflikt zu lösen

    commit 7b2c9df
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sat Sep 24 20:11:37 2022 +0100

        Unnötige Vererbung entfernt

    commit fbcc6cb
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sat Sep 24 20:10:46 2022 +0100

        Korrekturen

    commit 84b8c4f
    Merge: f3c5b1b c007eef
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sat Sep 24 20:08:05 2022 +0100

        Merge pull request marhei#750 from Emuricdo/main

    commit c007eef
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 24 00:59:40 2022 +0200

        Update TaskModel.json

    commit dc5360f
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 24 00:12:03 2022 +0200

        Update TaskModel.json

    commit e3c5768
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 24 00:07:49 2022 +0200

        Update TaskModel.json

    commit d5db463
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 24 00:05:10 2022 +0200

        Update TaskModel.json

    commit 932d6b1
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Fri Sep 23 23:57:36 2022 +0200

        Update TaskModel.json

    commit f3c5b1b
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Tue Sep 20 21:01:49 2022 +0200

        Vmax 193 auf 230 km/h erhöht

    commit 53a9722
    Merge: ef09152 0f7a144
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Mon Sep 19 20:35:22 2022 +0200

        Merge pull request marhei#747 from embix/demote-karlovpodjestedem

        minor fixes for recent PR Norden Tschechien

    commit 0f7a144
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Mon Sep 19 16:54:09 2022 +0200

        fix path suggestions for jobs passing Mittelherwigsdorf(Sachs)

    commit 820fc13
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Mon Sep 19 16:51:19 2022 +0200

        demote karlovpodjestedem - too close to other route

    commit ef09152
    Merge: 78bcada 43ffec8
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sun Sep 18 21:59:51 2022 +0200

        Merge pull request marhei#746 from embix/route-zittau-liberec

        Routen im Norden Tschechiens

    commit 78bcada
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sun Sep 18 21:56:53 2022 +0200

        Zur Wahrung der übersichtlichkeit Verbindung von XTPAN nach XTKLP entfernt

    commit f0df436
    Merge: d19841f d7083e1
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sun Sep 18 21:50:03 2022 +0200

        Merge pull request marhei#745 from embix/route-rumburk-mikulasovice

        Routes Rumburk-Pansky-Mikulasovice, Pansky-Krasna Lipa

    commit 43ffec8
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sun Sep 18 18:42:50 2022 +0200

        stations/route Mittelherwigsdorf(Sachs)-Rybniste

    commit 2658f33
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sun Sep 18 18:04:00 2022 +0200

        stations/route Ceska Lipa - Benesov nad Ploucnici

    commit dbbefe2
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sun Sep 18 17:14:56 2022 +0200

        stations/route ceska lipa - jedlova

    commit 22e79a6
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sun Sep 18 16:28:35 2022 +0200

        route/stations Liberec-CeskaLipa

    commit 238cd85
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sun Sep 18 14:41:58 2022 +0200

        add stations/route Zittau-Liberec

    commit d7083e1
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sun Sep 18 13:27:19 2022 +0200

        +jobs Rumburk-Pansky-(KransaLipa)-Mikulasovice

    commit d6fff9e
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sun Sep 18 13:19:22 2022 +0200

        stations/route pansky-krasnalipa

    commit d61e9b5
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sun Sep 18 13:00:49 2022 +0200

        +route/stations rumburk-pansky-mikulasovice

    commit d19841f
    Merge: 8aeef36 cbd7331
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sat Sep 17 23:41:09 2022 +0200

        Merge pull request marhei#742 from embix/jobs-nossen-freiberg-holzhau

        Jobs nossen freiberg holzhau

    commit 8aeef36
    Merge: 3c4e800 fabef11
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sat Sep 17 23:37:03 2022 +0200

        Merge pull request marhei#744 from karlbeecken/patch-4

        fix PNT/PON bug

    commit fabef11
    Author: Karl Beecken <karl@beecken.berlin>
    Date:   Sat Sep 17 19:49:31 2022 +0200

        fix PNT/PON bug

    commit cbd7331
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 17 15:38:48 2022 +0200

        fix route and suggestion

    commit e3ac9aa
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 17 15:21:47 2022 +0200

        +job RB 83 Freiberg-Holzhau

    commit 1259336
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 17 15:18:31 2022 +0200

        fix pathSuggestions Plaue-Erfurt

    commit 8e2e804
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 17 15:15:56 2022 +0200

        fix pathSuggestions Gotha-Erfurt

    commit 4823f7f
    Author: TrainCompany <train-company@c1710.de>
    Date:   Sat Sep 17 13:11:54 2022 +0000

        Projected coordinates

    commit 4a55f31
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 17 15:11:09 2022 +0200

        overhaul route Gotha-Erfurt

    commit fc1baf5
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 17 14:57:55 2022 +0200

        promote Holzhau, demote Holzhau Skilift

    commit 3906a69
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 17 14:51:49 2022 +0200

        +job Eisenbahnfreunde Nossen nach Arnsdorf

    commit 512f8b9
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 17 14:46:40 2022 +0200

        overhaul route Plaue-Erfurt

    commit 5beac56
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 17 14:36:03 2022 +0200

        +job Eisenbahnfreunde Nossen nach Holzhau

    commit 3c4e800
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sat Sep 17 12:12:44 2022 +0200

        Korrekturen bei den Netzwerken

    commit 162537e
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sat Sep 17 09:55:30 2022 +0200

        Fehlerhafte PathSuggestion korrigiert

    commit 9e12c35
    Merge: 38c8bd3 71c81e5
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sat Sep 17 09:53:39 2022 +0200

        Merge pull request marhei#741 from Emuricdo/main

        Nightstar

    commit 71c81e5
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sat Sep 17 09:51:36 2022 +0200

        Update DelayModel.json

        Syntax-Fehler behoben

    commit 0cbe599
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Fri Sep 16 23:26:48 2022 +0200

        Update TaskModel.json

    commit c09c865
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Fri Sep 16 23:21:07 2022 +0200

        Update TaskModel.json

    commit 6e5fdac
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Fri Sep 16 23:18:11 2022 +0200

        Update TaskModel.json

    commit 676af53
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Fri Sep 16 23:12:36 2022 +0200

        Update TaskModel.json

    commit 8024412
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Fri Sep 16 23:07:00 2022 +0200

        Update TaskModel.json

    commit 472b5ab
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Fri Sep 16 23:02:15 2022 +0200

        zusätzliche Verspätungen

    commit f83378d
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Fri Sep 16 22:28:48 2022 +0200

        Anpassung Name Renaissance/Nightstar-Wagen

    commit 2e64f53
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Fri Sep 16 22:26:14 2022 +0200

        Nightstar-Aufträge

    commit 38c8bd3
    Merge: fa855bb 0671a7a
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Thu Sep 15 09:28:12 2022 +0200

        Merge pull request marhei#740 from ChillLP/patch-ICE-L

        Removed some Vehicles from ICE-L and added 248

    commit 0671a7a
    Author: León <105374102+ChillLP@users.noreply.github.com>
    Date:   Wed Sep 14 21:51:57 2022 +0200

        Removed some Vehicles from ICE-L and added 248

    commit fa855bb
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Tue Sep 13 13:40:42 2022 +0200

        Texas Eagle korregiert (closes marhei#738)

    commit 16b0801
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Tue Sep 13 10:36:49 2022 +0200

        Einige unnötige Objets-Arrays entfernt

    commit 82c1bd0
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Tue Sep 13 10:08:54 2022 +0200

        Anpassungen

    commit 5a06fc2
    Merge: 0e14b02 2a47a8b
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Tue Sep 13 10:07:49 2022 +0200

        Merge pull request marhei#737 from embix/route-zittau-goerlitz

        add route Neißetalbahn Zittau-Görlitz

    commit 2a47a8b
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Mon Sep 12 20:49:24 2022 +0200

        +job ODEG RB65 Cottbus-Görlitz-Zittau

    commit 89f6c54
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Mon Sep 12 20:30:35 2022 +0200

        add route Neißetalbahn Zittau-Görlitz

        related: marhei#481

    commit 0e14b02
    Merge: 4286167 129b125
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Mon Sep 12 13:15:37 2022 +0200

        Merge pull request marhei#735 from karlbeecken/patch-3

        add bistroseats to more ICs and ICEs

    commit 4286167
    Merge: 390630a c9891bc
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Mon Sep 12 13:14:07 2022 +0200

        Merge pull request marhei#736 from Moritz-Schmidt/patch-1

        Fixed Texas Eagle Auftrag

    commit 129b125
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Mon Sep 12 13:13:32 2022 +0200

        Update TaskModel.json

        Bistroseats von IC2-Linie entfernt

    commit c9891bc
    Author: Moritz Schmidt <88738242+Moritz-Schmidt@users.noreply.github.com>
    Date:   Mon Sep 12 11:42:05 2022 +0200

        Fixed Texas Eagle Auftrag

        Auftrag war unmöglich da manche Stationen nicht existieren, diese nicht existierenden Stationen habe ich aus dem Auftrag entfernt

    commit 0a1f542
    Author: Karl Beecken <karl@beecken.berlin>
    Date:   Sun Sep 11 21:56:28 2022 +0200

        add bistroseats to more ICEs

    commit 901d0e0
    Author: Karl Beecken <karl@beecken.berlin>
    Date:   Sun Sep 11 21:53:36 2022 +0200

        add bistroseats to more ICs

    commit 390630a
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sun Sep 11 17:59:10 2022 +0200

        Parent-Netzwerk für iberisches Breitspurnetz gesetzt

    commit 8ce7bda
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sun Sep 11 13:22:02 2022 +0200

        Fix Typo

    commit e1b26b8
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sun Sep 11 10:03:49 2022 +0200

        Fix Typo

    commit 56df189
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sun Sep 11 09:58:54 2022 +0200

        Korrekturen

    commit b5122cb
    Merge: bd251a3 d7377c7
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sun Sep 11 09:51:42 2022 +0200

        Merge pull request marhei#734 from Emuricdo/main

        nordamerikanisches Rollmaterial

    commit bd251a3
    Merge: 9def738 acad52d
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sun Sep 11 09:49:12 2022 +0200

        Merge pull request marhei#733 from C1710/titanic

        #AllTheLinesAmtrak

    commit d7377c7
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sun Sep 11 04:31:54 2022 +0200

        US-Reisezugwagen

    commit 59a0a31
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sun Sep 11 03:28:59 2022 +0200

        US-Triebzüge

    commit 3fa10b6
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sun Sep 11 02:57:01 2022 +0200

        Hinzufügung N700S

        Hochgeschwindigkeitszug, um US-Schnellfahrstrecken mit höheren Geschwindigkeiten nutzen zu können
        Eigentlich sind die zwar für die Texas Central Railway vorgesehen, allerdings könnte es als Provisorium dienen, bis bekannt wird, welche Fahrzeuge auf der CHSR eingesetzt werden sollen

    commit f3bf32a
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sun Sep 11 02:33:19 2022 +0200

        US-Güterwagen

    commit fb81e11
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sun Sep 11 02:08:07 2022 +0200

        US-Elektrolokomotiven

    commit 5d1dfab
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sun Sep 11 00:24:03 2022 +0200

        US-Diesellokomotiven für Personenzüge

    commit b23acfd
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 23:09:25 2022 +0200

        US-Güterzuglokomotiven

    commit acad52d
    Author: Constantin A <git-user@c1710.de>
    Date:   Sat Sep 10 22:11:33 2022 +0200

        Small twistingFactor fix

    commit 91306f4
    Merge: a549fe1 9def738
    Author: Constantin A <git-user@c1710.de>
    Date:   Sat Sep 10 21:58:47 2022 +0200

        Merge remote-tracking branch 'upstream/main' into titanic

    commit a549fe1
    Author: Constantin A <git-user@c1710.de>
    Date:   Sat Sep 10 21:56:53 2022 +0200

        Add more (all?) remaining Amtrak services

    commit d86fd86
    Author: Constantin A <git-user@c1710.de>
    Date:   Sat Sep 10 21:44:28 2022 +0200

        Add route for Ethan Allen

    commit fe194ea
    Author: Constantin A <git-user@c1710.de>
    Date:   Sat Sep 10 21:42:31 2022 +0200

        Fix Burlington IA

    commit 56b5cb9
    Author: Constantin A <git-user@c1710.de>
    Date:   Sat Sep 10 21:33:15 2022 +0200

        Add last Amtrak lines

    commit 9def738
    Merge: e3c30d3 4c104f2
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sat Sep 10 19:28:45 2022 +0200

        Merge pull request marhei#732 from Emuricdo/main

        zusätzliche Ausstattungen

    commit ddee19a
    Author: Constantin A <git-user@c1710.de>
    Date:   Sat Sep 10 19:01:12 2022 +0200

        Add other stations/routes for Amtrak

    commit 4c104f2
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 17:46:47 2022 +0200

        Update Train.json

    commit 8841f9a
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 17:41:07 2022 +0200

        Update Train.json

    commit 85e65e9
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 17:32:33 2022 +0200

        Update Train.json

    commit 04f967e
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 17:30:04 2022 +0200

        Update Train.json

    commit 4e52e12
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 17:29:27 2022 +0200

        Update Train.json

    commit 465b2a6
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 17:12:05 2022 +0200

        Update Train.json

    commit 3af472c
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 17:09:58 2022 +0200

        Hinzufügung LINT 27 und LINT 41

    commit b025d97
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 16:59:31 2022 +0200

        zusätzliche Ausstattungen

    commit e3c30d3
    Merge: be44f60 01a7cb2
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sat Sep 10 16:57:32 2022 +0200

        Merge pull request marhei#731 from embix/fix-job-name

    commit 01a7cb2
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 16:42:41 2022 +0200

        fix job name

    commit e3e4ed3
    Author: Constantin A <git-user@c1710.de>
    Date:   Sat Sep 10 16:23:43 2022 +0200

        Correction for Gainesville (US-Georgia)

    commit 95c43c7
    Author: Constantin A <git-user@c1710.de>
    Date:   Sat Sep 10 16:02:54 2022 +0200

        Add Lancaster code

    commit be44f60
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sat Sep 10 15:28:05 2022 +0200

        PathSuggestions ergänzt

    commit 2df74c0
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sat Sep 10 15:18:13 2022 +0200

        Kleinere Korrekturen
        �

    commit 281c0b1
    Merge: 2dc55b2 2ffa4b9
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sat Sep 10 15:16:08 2022 +0200

        Merge pull request marhei#730 from embix/route-adorf-zwotental

        Routen/Jobs Westl. Erzgebirge

    commit 2ffa4b9
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 15:10:37 2022 +0200

        VBG RB5 Mehlteuer-Plauen-Kraslice-(Karlovy Vary)

    commit be8551e
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 15:05:54 2022 +0200

        +job VBG RB1 Zwickau-Kraslice-(Karlovy Vary)

    commit 0c195cf
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 15:01:03 2022 +0200

        Belarus-Nachrüstung einiger Diesellokomotiven

    commit 33b0676
    Author: Emuricdo <109828783+Emuricdo@users.noreply.github.com>
    Date:   Sat Sep 10 14:54:51 2022 +0200

        Hinzufügung 99.77-79, V200.1 und NOHAB AA16

    commit 930f54d
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 14:51:56 2022 +0200

        fix: put CD Os and RB in group 2 (RB/RE)

    commit 19ba771
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 14:46:43 2022 +0200

        add seasonal connection for RB80 to Chomutov

    commit 9ade442
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 14:39:17 2022 +0200

        +job Sonderzug OVEB

    commit bc90ad6
    Merge: 570cb56 2dc55b2
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 14:22:28 2022 +0200

        Merge remote-tracking branch 'upstream/main' into route-adorf-zwotental

    commit 570cb56
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 14:15:07 2022 +0200

        fix missing comma

    commit 8c8ad1b
    Author: TrainCompany <train-company@c1710.de>
    Date:   Sat Sep 10 12:14:14 2022 +0000

        Projected coordinates

    commit a0dccfe
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 14:13:35 2022 +0200

        add route/stations Muldenberg-Schönheide Ost

    commit 2dc55b2
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sat Sep 10 13:51:42 2022 +0200

        Nordafrika ist nun eigenes Netz

    commit f914cac
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 13:47:19 2022 +0200

        promote Mehltheuer according to actual status/infra

    commit 338ca86
    Author: TrainCompany <train-company@c1710.de>
    Date:   Sat Sep 10 11:26:20 2022 +0000

        Projected coordinates

    commit 62f28c1
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 13:25:41 2022 +0200

        add route/stations herlasgrün-falkenstein

    commit a2d84df
    Author: TrainCompany <train-company@c1710.de>
    Date:   Sat Sep 10 10:25:28 2022 +0000

        Projected coordinates

    commit fdd6be3
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Sat Sep 10 12:24:01 2022 +0200

        +Stations/Route Adorf-Zwotental

        related: marhei#481

    commit f854bd7
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sat Sep 10 11:03:15 2022 +0200

        Fehlerhafte Zuordnung korrigiert

    commit 1287ffe
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Sat Sep 10 10:03:11 2022 +0200

        Kleinere Korrekturen

    commit 4dc8f66
    Merge: e41f370 033cb61
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Sat Sep 10 10:00:23 2022 +0200

        Merge pull request marhei#729 from embix/route-zwickau-sokolov

        route Zwickau-Zwotental-Sokolov

    commit 033cb61
    Merge: f457bf4 e41f370
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Fri Sep 9 22:46:02 2022 +0200

        Merge remote-tracking branch 'upstream/main' into route-zwickau-sokolov

    commit f457bf4
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Fri Sep 9 22:44:49 2022 +0200

        fix remaining stations

    commit 31fe39c
    Author: TrainCompany <train-company@c1710.de>
    Date:   Fri Sep 9 20:26:25 2022 +0000

        Projected coordinates

    commit b18a1c3
    Author: Michel Bretschneider <embix@gmx.net>
    Date:   Fri Sep 9 22:24:28 2022 +0200

        +routes/stations zwickau-sokolov

        related: marhei#481

    commit d3aebea
    Author: Constantin A <git-user@c1710.de>
    Date:   Fri Sep 9 22:19:57 2022 +0200

        More Amtrak services

    commit f90e4dd
    Author: Constantin A <git-user@c1710.de>
    Date:   Fri Sep 9 21:54:39 2022 +0200

        Add some new Amtrak routes

    commit 4802238
    Author: Constantin A <git-user@c1710.de>
    Date:   Fri Sep 9 21:29:20 2022 +0200

        Add Lorton (Auto Train)

    commit cf8b680
    Author: Constantin A <git-user@c1710.de>
    Date:   Fri Sep 9 21:03:15 2022 +0200

        small name change

    commit f6cd935
    Merge: f25a00d e41f370
    Author: Constantin A <git-user@c1710.de>
    Date:   Fri Sep 9 21:00:25 2022 +0200

        Merge remote-tracking branch 'upstream/main' into titanic

    commit e41f370
    Merge: 2ada6d8 f7bd2b0
    Author: Marcel Heisinger <10304183+marhei@users.noreply.github.com>
    Date:   Fri Sep 9 19:53:35 2022 +0200

        Merge pull request marhei#728 from f2k1de/tgvtestfahrt

        Add TGV Testfahrt

    commit f7bd2b0
    Author: Isabelle <hi@f2k1.de>
    Date:   Fri Sep 9 19:43:21 2022 +0200

        Add TGV Testfahrt

    commit 2ada6d8
    Author: Marcel Heisinger <marhei@users.noreply.github.com>
    Date:   Thu Sep 8 20:30:20 2022 +0200

        Fix marhei#727

    commit f25a00d
    Merge: 925fc0f 5437e93
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Sep 5 22:47:55 2022 +0200

        Merge branch 'upstream-main' into titanic

        # Conflicts:
        #	Path.json
        #	Station.json

    commit 925fc0f
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Sep 5 22:25:23 2022 +0200

        Add California High Speed Rail initial Operation State

    commit 7c1b63a
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Sep 5 22:13:12 2022 +0200

        Central Valley Route Pt I

    commit 0dfc36b
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Sep 5 21:37:19 2022 +0200

        Small fix for Silver Star

    commit 0474022
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Sep 5 21:34:45 2022 +0200

        Part V of Southwest Chief route

    commit 87f757b
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Sep 5 21:31:07 2022 +0200

        Part IV of Southwest Chief route

    commit 812c563
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Sep 5 21:27:16 2022 +0200

        Part III of Southwest Chief route

    commit 31d93e8
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Sep 5 21:24:15 2022 +0200

        Part II of Southwest Chief route

    commit 0f911f4
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Sep 5 21:13:30 2022 +0200

        Add stations for Southwest Chief

    commit 4f24ddc
    Author: Constantin A <git-user@c1710.de>
    Date:   Sun Sep 4 22:25:59 2022 +0200

        Add small route for Carolinian

    commit aea1d77
    Author: Constantin A <git-user@c1710.de>
    Date:   Sun Sep 4 22:04:32 2022 +0200

        Pacific Surfliner route

    commit b1ce567
    Author: Constantin A <git-user@c1710.de>
    Date:   Sun Sep 4 21:55:04 2022 +0200

        Another US route

    commit 1bcdee6
    Author: Constantin A <git-user@c1710.de>
    Date:   Sun Sep 4 21:30:02 2022 +0200

        Change some station groups

    commit df7de7e
    Author: Constantin A <git-user@c1710.de>
    Date:   Sun Sep 4 21:12:20 2022 +0200

        Corrections

    commit 4a9726d
    Author: Constantin A <git-user@c1710.de>
    Date:   Sun Sep 4 20:48:51 2022 +0200

        Add some new US routes

    commit ae113c5
    Author: Constantin A <git-user@c1710.de>
    Date:   Tue Aug 30 23:29:36 2022 +0200

        Add Missouri River Runner

    commit 3b161ab
    Author: Constantin A <git-user@c1710.de>
    Date:   Tue Aug 30 23:27:46 2022 +0200

        Fix St Louis code

    commit 452c77e
    Author: Constantin A <git-user@c1710.de>
    Date:   Tue Aug 30 23:24:26 2022 +0200

        Add route to Kansas

    commit 9647b68
    Author: Constantin A <git-user@c1710.de>
    Date:   Tue Aug 30 23:20:52 2022 +0200

        Fix Cascades title

    commit 915ad32
    Author: Constantin A <git-user@c1710.de>
    Date:   Tue Aug 30 22:51:05 2022 +0200

        add fixme

    commit 281f138
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Aug 29 22:24:22 2022 +0200

        Add partial River Runner

    commit f8bc714
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Aug 29 22:12:58 2022 +0200

        Add correct Lincoln & Springfield

    commit 76a6a54
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Aug 29 22:08:09 2022 +0200

        Add rest of path to Austin

    commit 75f6f82
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Aug 29 21:55:31 2022 +0200

        Chicago-San Antonio (stations)

    commit 232de35
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Aug 29 21:18:56 2022 +0200

        Ad Toronto-Montreal

    commit 2986664
    Author: Constantin A <git-user@c1710.de>
    Date:   Mon Aug 29 21:04:09 2022 +0200

        Update license entry for Canada

commit be62dfa
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Sun Sep 25 09:36:59 2022 +0200

    Ausprobierung, meine Konflikt zu lösen
    Fixes marhei#725

commit 7b15c6c
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Thu Sep 22 15:55:48 2022 +0200

    Finale Anderung an der Corbeil Essonnes Bf.

commit 6d9db3b
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Thu Sep 22 15:19:25 2022 +0200

    - Bahnof Corbeil Essones zwsichen Juvisy und Melun hinzugefugt
    - Alle Aufträge an der RER D weiter gebaut mit diese Bahnof
    - Aufträge der OTC zwischen Paris und Nantes verbesserrt (abfhart PAZ, eine Variante über Tours und eine Variante über Versailles)

commit a97d0a9
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Thu Sep 22 10:30:10 2022 +0200

    Kleine Anderung, nach Prüfung der map_plot.svg

commit 55ddcd1
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Thu Sep 22 10:01:07 2022 +0200

    Verbesserung der Pariser Vororten, bzw. Pariser Knoten
    Fixes marhei#725

commit 2633b90
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Wed Sep 21 19:27:31 2022 +0200

    	modified:   TaskModel.json

commit 4b39147
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Wed Sep 21 19:24:35 2022 +0200

    	modified:   Path.json
    	modified:   TaskModel.json

commit c588e3d
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Wed Sep 21 19:09:53 2022 +0200

    	modified:   TaskModel.json

commit 6631ea0
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Wed Sep 21 19:07:53 2022 +0200

    	modified:   TaskModel.json

commit 7e68bcb
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Wed Sep 21 18:59:19 2022 +0200

    	modified:   Path.json
    	modified:   Station.json
    	modified:   TaskModel.json

commit 37a622c
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Wed Sep 21 18:06:11 2022 +0200

    	modified:   Path.json
    	modified:   TaskModel.json

commit a4a4415
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Wed Sep 21 18:06:04 2022 +0200

    Verbesserung der Pariser Vororten, bzw. Pariser Knoten
    Fixes marhei#725

commit 937615a
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Tue Sep 20 18:12:56 2022 +0200

    	modified:   Path.json
    	modified:   Station.json
    	modified:   TaskModel.json

commit 3774e73
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Tue Sep 20 15:47:55 2022 +0200

    	modified:   Path.json
    	modified:   Station.json

commit 2f08e33
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Tue Sep 20 14:09:46 2022 +0200

    	modified:   Path.json

commit f4ee236
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Tue Sep 20 14:06:59 2022 +0200

    	modified:   Path.json
    	modified:   Station.json

commit e1519e5
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Tue Sep 20 13:05:17 2022 +0200

    	modified:   Station.json

commit 5fac6c8
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Tue Sep 20 12:57:21 2022 +0200

    Verbesserung der Pariser Vororten, bzw. Pariser Knoten
    Fixes marhei#725

commit 32d3180
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Tue Sep 20 08:56:19 2022 +0200

    Rund auf Paris verbessern
    Fixes marhei#725

commit 28d2a0a
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Mon Sep 19 17:27:41 2022 +0200

    	modified:   Path.json
    	modified:   Station.json

commit 91be658
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Mon Sep 19 15:42:26 2022 +0200

    Strecke zwischen Epone Mezieres und Versailles Chantiers
    Fixes marhei#725

commit 0819135
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Mon Sep 19 15:40:25 2022 +0200

    Strecke zwischen Epone Mezieres und Versailles Chantiers
    Fixes marhei#725

commit 0a3cb11
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Fri Sep 16 15:39:27 2022 +0200

    Strecke zwischen Epone Mezieres und Versailles Chantiers
    Fixes marhei#725
@GeorgesBenisty
Merge branch 'GeorgesBenisty/issue725'
98d07e8
@GeorgesBenisty
Merge remote-tracking branch 'upstream/main' into GeorgesBenisty/issu…
5558b82 
…e725
@marhei marhei linked an issue Sep 25, 2022 that may be closed by this pull request
Verbesserung der Pariser Vororten, bzw. Pariser Knoten #725
Closed
@marhei
Copy link
Owner

marhei commented Sep 27, 2022

Hallo, ich kann dein Bedürfnis Paris möglichst realistisch darzustellen durchaus verstehen. Jedoch muss am Ende ein Kompromiss aus Realität und Übersichtlichkeit gefunden werden. Im Screenshot siehst du wie es mit deinen Änderungen aussieht und so ist das leider deutlich zu unübersichtlich. Vielleicht findet man dort einen besseren Kompromiss?

Capture d’écran 2022-09-27 à 14 52 34

@marhei
Copy link
Owner

marhei commented Sep 27, 2022

Ein erster Ansatz wäre es auf ein paar Streckenverzweigungen zu verzichten und diese eventuell im Nachbarbahnhof zu machen. Die großen Hbf müssen mehr Abstand zueinander haben um nicht einfach nur ein großer Punkt zu sein. Hierbei ist es sicher auch legitim ein bisschen auf realistische Koordinaten zu verzichten.

@GeorgesBenisty
Copy link
Author

GeorgesBenisty commented Sep 27, 2022 via email •
edited
Loading

@GeorgesBenisty
Squashed commit of the following:
2bbf7ba 
commit 02c7202
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Wed Sep 28 09:23:35 2022 +0200

     - Alle Pariser Bf. als group 2 geandert
     - Nicht relevante Bf. in group 5 wechselt
     - Wenn wichtig, Bf. in group 2 geandert so es bleibt in der Sicht
     - Vémars Dreieck und Juvisy Y-Koordinaten geandert
    Fixes marhei#725

commit e144bc4
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Tue Sep 27 15:01:53 2022 +0200

    Letzte Typo-Fix + XFVDF als angezeigte Bf. geändert

commit 375baef
Merge: 98d07e8 56aa2a9
Author: GeorgesBenisty <gbenisty@gmail.com>
Date:   Tue Sep 27 14:57:40 2022 +0200

    Ein paar falsche Name korrigiert (XFPE # XFPEST)
@GeorgesBenisty
Copy link
Author

Insgesamt habe ich meine Meinung wechselt : probiere ich, die Pariser Kopfbahnof in eine kleine Kategorie und kucken wir mal, wie es sieht.

@GeorgesBenisty GeorgesBenisty changed the title GeorgesBenisty/issue725 Issue 725 : Verbesserung der Pariser Knoten Sep 28, 2022
@marhei
Copy link
Owner

marhei commented Oct 12, 2022

Capture d’écran 2022-10-12 à 20 59 40

Tut mir leid wegen der späten Rückmeldung.

Ich hab mir das jetzt nochmal angeschaut, die Position einiger Bf muss falsch sein: Le vert de Maisons hat die gleiche Position wie CDG.

Im südlichen Bereich liegen sehr viele Stationen übereinander. Außerdem gibt es parallele Strecken, die nicht voreinander unterscheidbar sind (Melun-Juvisy einmal direkt und einmal über Corbeil-Essonnes).

@GeorgesBenisty
Copy link
Author

GeorgesBenisty commented Oct 12, 2022 via email •
edited
Loading

@GeorgesBenisty
- Koordinaten Vert de Maisons geändert
934223e 
 - Als Pariser Kofpbahnof als Klein Bhanof kategoriert
 - Mehrere Station im Katgeorie 5 geändert.
 - Direkte Strecke Juvisy-Melun entfernt.
 - BONUS : ETCS an der LGV Est hinzufügen.
 - BONUS : Nord Strecke der Grande Ceinture von Pierrefite nach Sartrouville hinzugefügt.
@GeorgesBenisty
- Epinay in Kategorie 5 geändert.
71af5c7
@marhei
Copy link
Owner

marhei commented Oct 24, 2022

Capture d’écran 2022-10-24 à 15 16 02

Weiterhin recht unübersichtlich, außerdem ist Epinay-sur-Seine wohl an der falschen Stelle.

@GeorgesBenisty
- Choisy le Roi u. Saint Cyr in kleine Kategorie
75558c6 
- Epinay u. Massy-Palaiseau Koordinaten geändert
- Raume im Paris intra-muros
@GeorgesBenisty GeorgesBenisty changed the title Issue 725 : Verbesserung der Pariser Knoten Verbesserung der Pariser Knoten Oct 29, 2022
@marhei
Copy link
Owner

marhei commented Oct 30, 2022

Capture d’écran 2022-10-30 à 16 06 40

So langsam wird es übersichtlicher, aber südlich vom Gare de Lyon muss noch etwas aufgeräumt werden.

@marhei
Copy link
Owner

marhei commented Nov 1, 2022

Capture d’écran 2022-11-01 à 18 50 24

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Verbesserung der Pariser Vororten, bzw. Pariser Knoten
2 participants
@GeorgesBenisty @marhei