Merge remote-tracking branch 'origin/1.20/dev' into 1.20/dev

common/src/main/resources/assets/railways/lang/de_at.json

@@ -1,4 +1,7 @@
 {
+  "block.create.railway_casing.tooltip": "ZUGROHMEN",
+  "block.create.railway_casing.tooltip.summary": "Drück n _Bogey Menü öffnen_ knopf (Standart _ALT_) um n Stil vom Bogey auszuwöhln.",
+  "block.create.track_station.tooltip": "BOHNHOF",
   "block.railways.conductor_whistle": "Lockführer-Pfeife",
   "block.railways.invisible_bogey": "Unsichtbares Drehgestell",
   "block.railways.mono_bogey": "Einschienenbahn-Drehgestell",
@@ -11,7 +14,6 @@
   "block.railways.smokestack_streamlined": "Stromlinienförmiger Schornstein",
   "block.railways.smokestack_woodburner": "Holzofen Schornstein",
   "block.railways.track_acacia": "Akazienholzgleis",
-  "block.railways.track_biomesoplenty_cherry": "Kirschenholzgleis",
   "block.railways.track_biomesoplenty_dead": "Totes Holzgleis",
   "block.railways.track_biomesoplenty_fir": "Tannenholzgleis",
   "block.railways.track_biomesoplenty_hellbark": "Höllenborkenholzgleis",
@@ -25,7 +27,6 @@
   "block.railways.track_birch": "Birkenholzgleis",
   "block.railways.track_blackstone": "Schwarzsteingleis",
   "block.railways.track_blue_skies_bluebright": "Blauschimmerholzgleis",
-  "block.railways.track_blue_skies_cherry": "Kirschenholzgleis",
   "block.railways.track_blue_skies_dusk": "Dämmerungsgleis",
   "block.railways.track_blue_skies_frostbright": "Froststrahlholzgleis",
   "block.railways.track_blue_skies_lunar": "Mondgleis",
@@ -35,7 +36,6 @@
   "block.railways.track_byg_baobab": "Baobabholzgleis",
   "block.railways.track_byg_blue_enchanted": "Blaues verzaubertes Gleis",
   "block.railways.track_byg_bulbis": "Bulbisholzgleis",
-  "block.railways.track_byg_cherry": "Kirschenholzgleis",
   "block.railways.track_byg_cika": "Cikaholzgleis",
   "block.railways.track_byg_cypress": "Zypressenholzgleis",
   "block.railways.track_byg_ebony": "Ebonholzgleis",

common/src/main/resources/assets/railways/lang/de_de.json

@@ -30,9 +30,6 @@
   "block.railways.track_acacia": "Akazienholzgleis",
   "block.railways.track_acacia_narrow": "Schmales Akazienholzgleis",
   "block.railways.track_acacia_wide": "Breites Akazienholzgleis",
-  "block.railways.track_biomesoplenty_cherry": "Kirschholzgleis",
-  "block.railways.track_biomesoplenty_cherry_narrow": "Schmales Kirschholzgleis",
-  "block.railways.track_biomesoplenty_cherry_wide": "Breites Kirschholzgleis",
   "block.railways.track_biomesoplenty_dead": "Totes Holzgleis",
   "block.railways.track_biomesoplenty_dead_narrow": "Schmales totes Holzgleis",
   "block.railways.track_biomesoplenty_dead_wide": "Breites totes Holzgleis",
@@ -72,9 +69,6 @@
   "block.railways.track_blue_skies_bluebright": "Blauschimmerholzgleis",
   "block.railways.track_blue_skies_bluebright_narrow": "Schmales Blauschimmerholzgleis",
   "block.railways.track_blue_skies_bluebright_wide": "Breites Blauschimmerholzgleis",
-  "block.railways.track_blue_skies_cherry": "Kirschholzgleis",
-  "block.railways.track_blue_skies_cherry_narrow": "Schmales Kirschholzgleis",
-  "block.railways.track_blue_skies_cherry_wide": "Breites Kirschholzgleis",
   "block.railways.track_blue_skies_dusk": "Dämmerungsgleis",
   "block.railways.track_blue_skies_dusk_narrow": "Schmales Dämmerungsgleis",
   "block.railways.track_blue_skies_dusk_wide": "Breites Dämmerungsgleis",
@@ -103,9 +97,6 @@
   "block.railways.track_byg_bulbis": "Bulbisholzgleis",
   "block.railways.track_byg_bulbis_narrow": "Schmales Bulbisholzgleis",
   "block.railways.track_byg_bulbis_wide": "Breites Bulbisholzgleis",
-  "block.railways.track_byg_cherry": "Kirschholzgleis",
-  "block.railways.track_byg_cherry_narrow": "Schmales Kirschholzgleis",
-  "block.railways.track_byg_cherry_wide": "Breites Kirschholzgleis",
   "block.railways.track_byg_cika": "Cikaholzgleis",
   "block.railways.track_byg_cika_narrow": "Schmales Cikaholzgleis",
   "block.railways.track_byg_cika_wide": "Breites Cikaholzgleis",
@@ -294,9 +285,6 @@
   "item.railways.track_incomplete_acacia": "Unfertiges Akazienholzgleis",
   "item.railways.track_incomplete_acacia_narrow": "Unfertige Schmales Akazienholzgleis",
   "item.railways.track_incomplete_acacia_wide": "Unfertige Breites Akazienholzgleis",
-  "item.railways.track_incomplete_biomesoplenty_cherry": "Unfertiges Kirschholzgleis",
-  "item.railways.track_incomplete_biomesoplenty_cherry_narrow": "Unfertige Schmales Kirschholzgleis",
-  "item.railways.track_incomplete_biomesoplenty_cherry_wide": "Unfertige Breites Kirschholzgleis",
   "item.railways.track_incomplete_biomesoplenty_dead": "Unfertiges totes Holzgleis",
   "item.railways.track_incomplete_biomesoplenty_dead_narrow": "Unfertige Schmales Dead Track",
   "item.railways.track_incomplete_biomesoplenty_dead_wide": "Unfertige Breites Dead Track",
@@ -336,9 +324,6 @@
   "item.railways.track_incomplete_blue_skies_bluebright": "Unfertige Bluebright Track",
   "item.railways.track_incomplete_blue_skies_bluebright_narrow": "Unfertige Schmales Bluebright Track",
   "item.railways.track_incomplete_blue_skies_bluebright_wide": "Unfertige Breites Bluebright Track",
-  "item.railways.track_incomplete_blue_skies_cherry": "Unfertige Cherry Track",
-  "item.railways.track_incomplete_blue_skies_cherry_narrow": "Unfertige Schmales Cherry Track",
-  "item.railways.track_incomplete_blue_skies_cherry_wide": "Unfertige Breites Cherry Track",
   "item.railways.track_incomplete_blue_skies_dusk": "Unfertige Dusk Track",
   "item.railways.track_incomplete_blue_skies_dusk_narrow": "Unfertige Schmales Dusk Track",
   "item.railways.track_incomplete_blue_skies_dusk_wide": "Unfertige Breites Dusk Track",
@@ -366,9 +351,6 @@
   "item.railways.track_incomplete_byg_bulbis": "Unfertige Bulbis Track",
   "item.railways.track_incomplete_byg_bulbis_narrow": "Unfertige Schmales Bulbis Track",
   "item.railways.track_incomplete_byg_bulbis_wide": "Unfertige Breites Bulbis Track",
-  "item.railways.track_incomplete_byg_cherry": "Unfertige Cherry Track",
-  "item.railways.track_incomplete_byg_cherry_narrow": "Unfertige Schmales Cherry Track",
-  "item.railways.track_incomplete_byg_cherry_wide": "Unfertige Breites Cherry Track",
   "item.railways.track_incomplete_byg_cika": "Unfertige Cika Track",
   "item.railways.track_incomplete_byg_cika_narrow": "Unfertige Schmales Cika Track",
   "item.railways.track_incomplete_byg_cika_wide": "Unfertige Breites Cika Track",

common/src/main/resources/assets/railways/lang/fr_fr.json

@@ -23,9 +23,6 @@
   "block.railways.track_acacia": "Rail de train en acacia",
   "block.railways.track_acacia_narrow": "Voie d'acacia étroite",
   "block.railways.track_acacia_wide": "Voie d'acacia large",
-  "block.railways.track_biomesoplenty_cherry": "Voie de cerisier",
-  "block.railways.track_biomesoplenty_cherry_narrow": "Voie de cerisier étroite",
-  "block.railways.track_biomesoplenty_cherry_wide": "Voie de cerisier large",
   "block.railways.track_biomesoplenty_dead": "Voie en bois mort",
   "block.railways.track_biomesoplenty_dead_narrow": "Voie en bois mort étroite",
   "block.railways.track_biomesoplenty_dead_wide": "Voie en bois mort large",

common/src/main/resources/assets/railways/lang/ja_jp.json

@@ -38,9 +38,6 @@
   "block.railways.track_acacia": "アカシアの鉄道用線路",
   "block.railways.track_acacia_narrow": "狭いアカシアの鉄道用線路",
   "block.railways.track_acacia_wide": "広いアカシアの鉄道用線路",
-  "block.railways.track_biomesoplenty_cherry": "桜の鉄道用線路",
-  "block.railways.track_biomesoplenty_cherry_narrow": "狭い桜の鉄道用線路",
-  "block.railways.track_biomesoplenty_cherry_wide": "広い桜の鉄道用線路",
   "block.railways.track_biomesoplenty_dead": "枯れた木の鉄道用線路",
   "block.railways.track_biomesoplenty_dead_narrow": "狭い枯れた木の鉄道用線路",
   "block.railways.track_biomesoplenty_dead_wide": "広い枯れた木の鉄道用線路",
@@ -80,9 +77,6 @@
   "block.railways.track_blue_skies_bluebright": "ブルーブライトの鉄道用線路",
   "block.railways.track_blue_skies_bluebright_narrow": "狭いブルーブライトの鉄道用線路",
   "block.railways.track_blue_skies_bluebright_wide": "広いブルーブライトの鉄道用線路",
-  "block.railways.track_blue_skies_cherry": "桜の鉄道用線路",
-  "block.railways.track_blue_skies_cherry_narrow": "狭い桜の鉄道用線路",
-  "block.railways.track_blue_skies_cherry_wide": "広い桜の鉄道用線路",
   "block.railways.track_blue_skies_dusk": "黄昏の鉄道用線路",
   "block.railways.track_blue_skies_dusk_narrow": "狭い黄昏の木の鉄道用線路",
   "block.railways.track_blue_skies_dusk_wide": "広い黄昏の木の鉄道用線路",
@@ -111,9 +105,6 @@
   "block.railways.track_byg_bulbis": "バルビスの鉄道用線路",
   "block.railways.track_byg_bulbis_narrow": "狭いバルビスの鉄道用線路",
   "block.railways.track_byg_bulbis_wide": "広いバルビスの鉄道用線路",
-  "block.railways.track_byg_cherry": "サクラの鉄道用線路",
-  "block.railways.track_byg_cherry_narrow": "狭いサクラの鉄道用線路",
-  "block.railways.track_byg_cherry_wide": "広いサクラの鉄道用線路",
   "block.railways.track_byg_cika": "チカの鉄道用線路",
   "block.railways.track_byg_cika_narrow": "狭いチカの鉄道用線路",
   "block.railways.track_byg_cika_wide": "広いチカの鉄道用線路",
@@ -302,9 +293,6 @@
   "item.railways.track_incomplete_acacia": "組み立て中のアカシアの鉄道用線路",
   "item.railways.track_incomplete_acacia_narrow": "組み立て中の狭いアカシアの鉄道用線路",
   "item.railways.track_incomplete_acacia_wide": "組み立て中の広いアカシアの鉄道用線路",
-  "item.railways.track_incomplete_biomesoplenty_cherry": "組み立て中のサクラの鉄道用線路",
-  "item.railways.track_incomplete_biomesoplenty_cherry_narrow": "組み立て中の狭いサクラの鉄道用線路",
-  "item.railways.track_incomplete_biomesoplenty_cherry_wide": "組み立て中の広いサクラの鉄道用線路",
   "item.railways.track_incomplete_biomesoplenty_dead": "組み立て中の枯れた木の鉄道用線路",
   "item.railways.track_incomplete_biomesoplenty_dead_narrow": "組み立て中の狭い枯れた木の鉄道用線路",
   "item.railways.track_incomplete_biomesoplenty_dead_wide": "組み立て中の広い枯れた木の鉄道用線路",
@@ -344,9 +332,6 @@
   "item.railways.track_incomplete_blue_skies_bluebright": "組み立て中のブルーブライトの鉄道用線路",
   "item.railways.track_incomplete_blue_skies_bluebright_narrow": "組み立て中の狭いブルーブライトの鉄道用線路",
   "item.railways.track_incomplete_blue_skies_bluebright_wide": "組み立て中の広いブルーブライトの鉄道用線路",
-  "item.railways.track_incomplete_blue_skies_cherry": "組み立て中のサクラの鉄道用線路",
-  "item.railways.track_incomplete_blue_skies_cherry_narrow": "組み立て中の狭いサクラの鉄道用線路",
-  "item.railways.track_incomplete_blue_skies_cherry_wide": "組み立て中の広いサクラの鉄道用線路",
   "item.railways.track_incomplete_blue_skies_dusk": "組み立て中の黄昏の鉄道用線路",
   "item.railways.track_incomplete_blue_skies_dusk_narrow": "組み立て中の狭い黄昏の木の鉄道用線路",
   "item.railways.track_incomplete_blue_skies_dusk_wide": "組み立て中の広い黄昏の木の鉄道用線路",
@@ -374,9 +359,6 @@
   "item.railways.track_incomplete_byg_bulbis": "組み立て中のバルビスの鉄道用線路",
   "item.railways.track_incomplete_byg_bulbis_narrow": "組み立て中の狭いバルビスの鉄道用線路",
   "item.railways.track_incomplete_byg_bulbis_wide": "組み立て中の広いバルビスの鉄道用線路",
-  "item.railways.track_incomplete_byg_cherry": "組み立て中のサクラの鉄道用線路",
-  "item.railways.track_incomplete_byg_cherry_narrow": "組み立て中の狭いサクラの鉄道用線路",
-  "item.railways.track_incomplete_byg_cherry_wide": "組み立て中の広いサクラの鉄道用線路",
   "item.railways.track_incomplete_byg_cika": "組み立て中のチカの鉄道用線路",
   "item.railways.track_incomplete_byg_cika_narrow": "組み立て中の狭いチカの鉄道用線路",
   "item.railways.track_incomplete_byg_cika_wide": "組み立て中の広いチカの鉄道用線路",

common/src/main/resources/assets/railways/lang/ko_kr.json

@@ -270,9 +270,6 @@
   "block.railways.track_acacia": "아카시아나무 기차 선로",
   "block.railways.track_acacia_narrow": "좁은 아카시아나무 기차 선로",
   "block.railways.track_acacia_wide": "넓은 아카시아나무 기차 선로",
-  "block.railways.track_biomesoplenty_cherry": "벚나무 기차 선로",
-  "block.railways.track_biomesoplenty_cherry_narrow": "좁은 벚나무 기차 선로",
-  "block.railways.track_biomesoplenty_cherry_wide": "넓은 벚나무 기차 선로",
   "block.railways.track_birch": "자작나무 기차 선로",
   "block.railways.track_birch_narrow": "좁은 자작나무 기차 선로",
   "block.railways.track_birch_wide": "넓은 자작나무 기차 선로",

common/src/main/resources/assets/railways/lang/nl_nl.json

@@ -234,9 +234,6 @@
   "block.railways.track_acacia": "Acacia Treinspoor",
   "block.railways.track_acacia_narrow": "Smalle Acacia Treinspoor",
   "block.railways.track_acacia_wide": "Breede Acacia Treinspoor",
-  "block.railways.track_biomesoplenty_cherry": "Kersenhouten Treinspoor",
-  "block.railways.track_biomesoplenty_cherry_narrow": "Smal Kersenhouten Treinspoor",
-  "block.railways.track_biomesoplenty_cherry_wide": "Breed Kersenhouten Treinspoor",
   "block.railways.track_biomesoplenty_dead": "Dood Houten Treinspoor",
   "block.railways.track_biomesoplenty_dead_narrow": "Smal Dood Houten Treinspoor",
   "block.railways.track_biomesoplenty_dead_wide": "Breed Dood Houten Treinspoor",
@@ -276,9 +273,6 @@
   "block.railways.track_blue_skies_bluebright": "Helderblauwhouten Treinspoor",
   "block.railways.track_blue_skies_bluebright_narrow": "Smal Helderblauwhouten Treinspoor",
   "block.railways.track_blue_skies_bluebright_wide": "Breed Helderblauwhouten Treinspoor",
-  "block.railways.track_blue_skies_cherry": "Kersenhouten Treinspoor",
-  "block.railways.track_blue_skies_cherry_narrow": "Smal Kersenhouten Treinspoor",
-  "block.railways.track_blue_skies_cherry_wide": "Breed Kersenhouten Treinspoor",
   "block.railways.track_blue_skies_dusk": "Schemeringhouten Treinspoor",
   "block.railways.track_blue_skies_dusk_narrow": "Smal Schemeringhouten Treinspoor",
   "block.railways.track_blue_skies_dusk_wide": "Breed Schemeringhouten Treinspoor",
@@ -306,9 +300,6 @@
   "block.railways.track_byg_bulbis": "Bulbishouten Treinspoor",
   "block.railways.track_byg_bulbis_narrow": "Smal Bulbishouten Treinspoor",
   "block.railways.track_byg_bulbis_wide": "Breed Bulbishouten Treinspoor",
-  "block.railways.track_byg_cherry": "Kersenhouten Treinspoor",
-  "block.railways.track_byg_cherry_narrow": "Smal Kersenhouten Treinspoor",
-  "block.railways.track_byg_cherry_wide": "Breed Kersenhouten Treinspoor",
   "block.railways.track_byg_cika": "Cikahouten Treinspoor",
   "block.railways.track_byg_cika_narrow": "Smal Cikahouten Treinspoor",
   "block.railways.track_byg_cika_wide": "Breed Cikahouten Treinspoor",

common/src/main/resources/assets/railways/lang/no_no.json

@@ -279,9 +279,6 @@
   "block.railways.track_acacia": "Akasietogspor",
   "block.railways.track_acacia_narrow": "Smalt akasietogspor",
   "block.railways.track_acacia_wide": "Bredt akasietogspor",
-  "block.railways.track_biomesoplenty_cherry": "Kirsebærtogspor",
-  "block.railways.track_biomesoplenty_cherry_narrow": "Smalt kirsebærtogspor",
-  "block.railways.track_biomesoplenty_cherry_wide": "Bredt kirsebærtogspor",
   "block.railways.track_biomesoplenty_dead": "Dødt togspor",
   "block.railways.track_biomesoplenty_dead_narrow": "Smalt dødt togspor",
   "block.railways.track_biomesoplenty_dead_wide": "Bredt dødt togspor",
@@ -321,9 +318,6 @@
   "block.railways.track_blue_skies_bluebright": "Blålyst togspor",
   "block.railways.track_blue_skies_bluebright_narrow": "Smalt blålyst togspor",
   "block.railways.track_blue_skies_bluebright_wide": "Bredt blålyst togspor",
-  "block.railways.track_blue_skies_cherry": "Kirsebærtogspor",
-  "block.railways.track_blue_skies_cherry_narrow": "Smalt kirsebærtogspor",
-  "block.railways.track_blue_skies_cherry_wide": "Bredt kirsebærtogspor",
   "block.railways.track_blue_skies_frostbright": "Frostlyst togspor",
   "block.railways.track_blue_skies_frostbright_narrow": "Smalt frostlyst togspor",
   "block.railways.track_blue_skies_frostbright_wide": "Bredt frostlyst togspor",
@@ -347,9 +341,6 @@
   "block.railways.track_byg_bulbis": "Bulbistogspor",
   "block.railways.track_byg_bulbis_narrow": "Smalt bulbistogspor",
   "block.railways.track_byg_bulbis_wide": "Bredt bulbistogspor",
-  "block.railways.track_byg_cherry": "Kirsebærtogspor",
-  "block.railways.track_byg_cherry_narrow": "Smalt kirsebærtogspor",
-  "block.railways.track_byg_cherry_wide": "Bredt kirsebærtogspor",
   "block.railways.track_byg_cika": "Cikatogspor",
   "block.railways.track_byg_cika_narrow": "Smalt cikatogspor",
   "block.railways.track_byg_cika_wide": "Bredt cikatogspor",
@@ -605,9 +596,6 @@
   "item.railways.track_incomplete_acacia": "Ufullstendig akasietogspor",
   "item.railways.track_incomplete_acacia_narrow": "Ufullstendig smalt akasietogspor",
   "item.railways.track_incomplete_acacia_wide": "Ufullstendig bredt akasietogspor",
-  "item.railways.track_incomplete_biomesoplenty_cherry": "Ufullstendig kirsebærspor",
-  "item.railways.track_incomplete_biomesoplenty_cherry_narrow": "Ufullstendig smalt kirsebærspor",
-  "item.railways.track_incomplete_biomesoplenty_cherry_wide": "Ufullstendig bredt kirsebærspor",
   "item.railways.track_incomplete_biomesoplenty_dead": "Ufullstendig dødt spor",
   "item.railways.track_incomplete_biomesoplenty_dead_narrow": "Ufullstendig smalt dødt spor",
   "item.railways.track_incomplete_biomesoplenty_dead_wide": "Ufullstendig bredt dødt spor",
@@ -647,9 +635,6 @@
   "item.railways.track_incomplete_blue_skies_bluebright": "Ufullstendig blålyst togspor",
   "item.railways.track_incomplete_blue_skies_bluebright_narrow": "Ufullstendig smalt blålyst togspor",
   "item.railways.track_incomplete_blue_skies_bluebright_wide": "Ufullstendig bredt blålyst togspor",
-  "item.railways.track_incomplete_blue_skies_cherry": "Ufullstendig kirsebærspor",
-  "item.railways.track_incomplete_blue_skies_cherry_narrow": "Ufullstendig smalt kirsebærspor",
-  "item.railways.track_incomplete_blue_skies_cherry_wide": "Ufullstendig bredt kirsebærspor",
   "item.railways.track_incomplete_blue_skies_frostbright": "Ufullstendig frostlyst togspor",
   "item.railways.track_incomplete_blue_skies_frostbright_narrow": "Ufullstendig smalt frostlyst togspor",
   "item.railways.track_incomplete_blue_skies_frostbright_wide": "Ufullstendig bredt frostlyst togspor",
@@ -671,9 +656,6 @@
   "item.railways.track_incomplete_byg_bulbis": "Ufullstendig bulbistogspor",
   "item.railways.track_incomplete_byg_bulbis_narrow": "Ufullstendig smalt bulbistogspor",
   "item.railways.track_incomplete_byg_bulbis_wide": "Ufullstendig bredt bulbistogspor",
-  "item.railways.track_incomplete_byg_cherry": "Ufullstendig kirsebærspor",
-  "item.railways.track_incomplete_byg_cherry_narrow": "Ufullstendig smalt kirsebærspor",
-  "item.railways.track_incomplete_byg_cherry_wide": "Ufullstendig bredt kirsebærspor",
   "item.railways.track_incomplete_byg_cika": "Ufullstendig cikatogspor",
   "item.railways.track_incomplete_byg_cika_narrow": "Ufullstendig smalt cikatogspor",
   "item.railways.track_incomplete_byg_cika_wide": "Ufullstendig bredt cikatogspor",