224 files changed, 247 insertions, 220 deletions

diff --git a/atc.lua b/advtrains/atc.lua
index 0afddb0..0afddb0 100644
--- a/atc.lua
+++ b/advtrains/atc.lua
diff --git a/couple.lua b/advtrains/couple.lua
index a846c8b..a846c8b 100644
--- a/couple.lua
+++ b/advtrains/couple.lua
diff --git a/crafting.lua b/advtrains/crafting.lua
index dd43512..5ba12ce 100644
--- a/crafting.lua
+++ b/advtrains/crafting.lua
@@ -65,39 +65,7 @@ minetest.register_craft({
 	},
 })
 
---wagons
-minetest.register_craft({
-	output = 'advtrains:newlocomotive',
-	recipe = {
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-		{'default:steelblock', 'dye:black', 'default:steelblock'},
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-	},
-})
-minetest.register_craft({
-	output = 'advtrains:wagon_default',
-	recipe = {
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-		{'default:steelblock', 'dye:dark_green', 'default:steelblock'},
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-	},
-})
-minetest.register_craft({
-	output = 'advtrains:wagon_box',
-	recipe = {
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-		{'default:steelblock', 'default:junglewood', 'default:steelblock'},
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-	},
-})
-minetest.register_craft({
-	output = 'advtrains:subway_wagon',
-	recipe = {
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-		{'default:steelblock', 'dye:yellow', 'default:steelblock'},
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-	},
-})
+
 
 --misc_nodes
 --crafts for platforms see misc_nodes.lua
diff --git a/damage.lua b/advtrains/damage.lua
index b39fe67..b39fe67 100644
--- a/damage.lua
+++ b/advtrains/damage.lua
diff --git a/debugitems.lua b/advtrains/debugitems.lua
index b3164ff..b3164ff 100644
--- a/debugitems.lua
+++ b/advtrains/debugitems.lua
diff --git a/depends.txt b/advtrains/depends.txt
index 20aa884..20aa884 100644
--- a/depends.txt
+++ b/advtrains/depends.txt
diff --git a/description.txt b/advtrains/description.txt
index ecc5d58..ecc5d58 100644
--- a/description.txt
+++ b/advtrains/description.txt
diff --git a/helpers.lua b/advtrains/helpers.lua
index 6a8175f..6a8175f 100644
--- a/helpers.lua
+++ b/advtrains/helpers.lua
diff --git a/init.lua b/advtrains/init.lua
index 41b624e..41b624e 100644
--- a/init.lua
+++ b/advtrains/init.lua
diff --git a/misc_nodes.lua b/advtrains/misc_nodes.lua
index 93829f0..93829f0 100644
--- a/misc_nodes.lua
+++ b/advtrains/misc_nodes.lua
diff --git a/models/advtrains_dtrack_bumper_st.b3d b/advtrains/models/advtrains_dtrack_bumper_st.b3d
index a6d9745..a6d9745 100644
--- a/models/advtrains_dtrack_bumper_st.b3d
+++ b/advtrains/models/advtrains_dtrack_bumper_st.b3d
diff --git a/models/advtrains_dtrack_bumper_st_30.b3d b/advtrains/models/advtrains_dtrack_bumper_st_30.b3d
index 5f5b3f4..5f5b3f4 100644
--- a/models/advtrains_dtrack_bumper_st_30.b3d
+++ b/advtrains/models/advtrains_dtrack_bumper_st_30.b3d
diff --git a/models/advtrains_dtrack_bumper_st_45.b3d b/advtrains/models/advtrains_dtrack_bumper_st_45.b3d
index f13ae75..f13ae75 100644
--- a/models/advtrains_dtrack_bumper_st_45.b3d
+++ b/advtrains/models/advtrains_dtrack_bumper_st_45.b3d
diff --git a/models/advtrains_dtrack_bumper_st_60.b3d b/advtrains/models/advtrains_dtrack_bumper_st_60.b3d
index 59a2285..59a2285 100644
--- a/models/advtrains_dtrack_bumper_st_60.b3d
+++ b/advtrains/models/advtrains_dtrack_bumper_st_60.b3d
diff --git a/models/advtrains_dtrack_cr.b3d b/advtrains/models/advtrains_dtrack_cr.b3d
index 159717e..159717e 100644
--- a/models/advtrains_dtrack_cr.b3d
+++ b/advtrains/models/advtrains_dtrack_cr.b3d
diff --git a/models/advtrains_dtrack_cr_30.b3d b/advtrains/models/advtrains_dtrack_cr_30.b3d
index 09cdb1f..09cdb1f 100644
--- a/models/advtrains_dtrack_cr_30.b3d
+++ b/advtrains/models/advtrains_dtrack_cr_30.b3d
diff --git a/models/advtrains_dtrack_cr_45.b3d b/advtrains/models/advtrains_dtrack_cr_45.b3d
index 176da81..176da81 100644
--- a/models/advtrains_dtrack_cr_45.b3d
+++ b/advtrains/models/advtrains_dtrack_cr_45.b3d
diff --git a/models/advtrains_dtrack_cr_60.b3d b/advtrains/models/advtrains_dtrack_cr_60.b3d
index 00313c8..00313c8 100644
--- a/models/advtrains_dtrack_cr_60.b3d
+++ b/advtrains/models/advtrains_dtrack_cr_60.b3d
diff --git a/models/advtrains_dtrack_detector_st.b3d b/advtrains/models/advtrains_dtrack_detector_st.b3d
index 893c8cd..893c8cd 100644
--- a/models/advtrains_dtrack_detector_st.b3d
+++ b/advtrains/models/advtrains_dtrack_detector_st.b3d
diff --git a/models/advtrains_dtrack_detector_st_30.b3d b/advtrains/models/advtrains_dtrack_detector_st_30.b3d
index 2e59e93..2e59e93 100644
--- a/models/advtrains_dtrack_detector_st_30.b3d
+++ b/advtrains/models/advtrains_dtrack_detector_st_30.b3d
diff --git a/models/advtrains_dtrack_detector_st_45.b3d b/advtrains/models/advtrains_dtrack_detector_st_45.b3d
index c73166f..c73166f 100644
--- a/models/advtrains_dtrack_detector_st_45.b3d
+++ b/advtrains/models/advtrains_dtrack_detector_st_45.b3d
diff --git a/models/advtrains_dtrack_detector_st_60.b3d b/advtrains/models/advtrains_dtrack_detector_st_60.b3d
index b6bc9af..b6bc9af 100644
--- a/models/advtrains_dtrack_detector_st_60.b3d
+++ b/advtrains/models/advtrains_dtrack_detector_st_60.b3d
diff --git a/models/advtrains_dtrack_st.b3d b/advtrains/models/advtrains_dtrack_st.b3d
index f3e2753..f3e2753 100644
--- a/models/advtrains_dtrack_st.b3d
+++ b/advtrains/models/advtrains_dtrack_st.b3d
diff --git a/models/advtrains_dtrack_st_30.b3d b/advtrains/models/advtrains_dtrack_st_30.b3d
index 7a35c8d..7a35c8d 100644
--- a/models/advtrains_dtrack_st_30.b3d
+++ b/advtrains/models/advtrains_dtrack_st_30.b3d
diff --git a/models/advtrains_dtrack_st_45.b3d b/advtrains/models/advtrains_dtrack_st_45.b3d
index b2a1702..b2a1702 100644
--- a/models/advtrains_dtrack_st_45.b3d
+++ b/advtrains/models/advtrains_dtrack_st_45.b3d
diff --git a/models/advtrains_dtrack_st_60.b3d b/advtrains/models/advtrains_dtrack_st_60.b3d
index 0a59f77..0a59f77 100644
--- a/models/advtrains_dtrack_st_60.b3d
+++ b/advtrains/models/advtrains_dtrack_st_60.b3d
diff --git a/models/advtrains_dtrack_swlcr.b3d b/advtrains/models/advtrains_dtrack_swlcr.b3d
index 1adc23f..1adc23f 100644
--- a/models/advtrains_dtrack_swlcr.b3d
+++ b/advtrains/models/advtrains_dtrack_swlcr.b3d
diff --git a/models/advtrains_dtrack_swlcr_30.b3d b/advtrains/models/advtrains_dtrack_swlcr_30.b3d
index 7d8373b..7d8373b 100644
--- a/models/advtrains_dtrack_swlcr_30.b3d
+++ b/advtrains/models/advtrains_dtrack_swlcr_30.b3d
diff --git a/models/advtrains_dtrack_swlcr_45.b3d b/advtrains/models/advtrains_dtrack_swlcr_45.b3d
index 9679b9e..9679b9e 100644
--- a/models/advtrains_dtrack_swlcr_45.b3d
+++ b/advtrains/models/advtrains_dtrack_swlcr_45.b3d
diff --git a/models/advtrains_dtrack_swlcr_60.b3d b/advtrains/models/advtrains_dtrack_swlcr_60.b3d
index 3efc924..3efc924 100644
--- a/models/advtrains_dtrack_swlcr_60.b3d
+++ b/advtrains/models/advtrains_dtrack_swlcr_60.b3d
diff --git a/models/advtrains_dtrack_swlst.b3d b/advtrains/models/advtrains_dtrack_swlst.b3d
index 93841a4..93841a4 100644
--- a/models/advtrains_dtrack_swlst.b3d
+++ b/advtrains/models/advtrains_dtrack_swlst.b3d
diff --git a/models/advtrains_dtrack_swlst_30.b3d b/advtrains/models/advtrains_dtrack_swlst_30.b3d
index e9a90c7..e9a90c7 100644
--- a/models/advtrains_dtrack_swlst_30.b3d
+++ b/advtrains/models/advtrains_dtrack_swlst_30.b3d
diff --git a/models/advtrains_dtrack_swlst_45.b3d b/advtrains/models/advtrains_dtrack_swlst_45.b3d
index 49c707c..49c707c 100644
--- a/models/advtrains_dtrack_swlst_45.b3d
+++ b/advtrains/models/advtrains_dtrack_swlst_45.b3d
diff --git a/models/advtrains_dtrack_swlst_60.b3d b/advtrains/models/advtrains_dtrack_swlst_60.b3d
index c9a6ffe..c9a6ffe 100644
--- a/models/advtrains_dtrack_swlst_60.b3d
+++ b/advtrains/models/advtrains_dtrack_swlst_60.b3d
diff --git a/models/advtrains_dtrack_swrcr.b3d b/advtrains/models/advtrains_dtrack_swrcr.b3d
index ee29b62..ee29b62 100644
--- a/models/advtrains_dtrack_swrcr.b3d
+++ b/advtrains/models/advtrains_dtrack_swrcr.b3d
diff --git a/models/advtrains_dtrack_swrcr_30.b3d b/advtrains/models/advtrains_dtrack_swrcr_30.b3d
index ba065e1..ba065e1 100644
--- a/models/advtrains_dtrack_swrcr_30.b3d
+++ b/advtrains/models/advtrains_dtrack_swrcr_30.b3d
diff --git a/models/advtrains_dtrack_swrcr_45.b3d b/advtrains/models/advtrains_dtrack_swrcr_45.b3d
index 7f9dc43..7f9dc43 100644
--- a/models/advtrains_dtrack_swrcr_45.b3d
+++ b/advtrains/models/advtrains_dtrack_swrcr_45.b3d
diff --git a/models/advtrains_dtrack_swrcr_60.b3d b/advtrains/models/advtrains_dtrack_swrcr_60.b3d
index b8ffa61..b8ffa61 100644
--- a/models/advtrains_dtrack_swrcr_60.b3d
+++ b/advtrains/models/advtrains_dtrack_swrcr_60.b3d
diff --git a/models/advtrains_dtrack_swrst.b3d b/advtrains/models/advtrains_dtrack_swrst.b3d
index 0b3e7ad..0b3e7ad 100644
--- a/models/advtrains_dtrack_swrst.b3d
+++ b/advtrains/models/advtrains_dtrack_swrst.b3d
diff --git a/models/advtrains_dtrack_swrst_30.b3d b/advtrains/models/advtrains_dtrack_swrst_30.b3d
index 4aea19b..4aea19b 100644
--- a/models/advtrains_dtrack_swrst_30.b3d
+++ b/advtrains/models/advtrains_dtrack_swrst_30.b3d
diff --git a/models/advtrains_dtrack_swrst_45.b3d b/advtrains/models/advtrains_dtrack_swrst_45.b3d
index 4182fe5..4182fe5 100644
--- a/models/advtrains_dtrack_swrst_45.b3d
+++ b/advtrains/models/advtrains_dtrack_swrst_45.b3d
diff --git a/models/advtrains_dtrack_swrst_60.b3d b/advtrains/models/advtrains_dtrack_swrst_60.b3d
index 6d2c891..6d2c891 100644
--- a/models/advtrains_dtrack_swrst_60.b3d
+++ b/advtrains/models/advtrains_dtrack_swrst_60.b3d
diff --git a/models/advtrains_dtrack_vst1.b3d b/advtrains/models/advtrains_dtrack_vst1.b3d
index c9d7427..c9d7427 100644
--- a/models/advtrains_dtrack_vst1.b3d
+++ b/advtrains/models/advtrains_dtrack_vst1.b3d
diff --git a/models/advtrains_dtrack_vst1_45.b3d b/advtrains/models/advtrains_dtrack_vst1_45.b3d
index 14d438c..14d438c 100644
--- a/models/advtrains_dtrack_vst1_45.b3d
+++ b/advtrains/models/advtrains_dtrack_vst1_45.b3d
diff --git a/models/advtrains_dtrack_vst2.b3d b/advtrains/models/advtrains_dtrack_vst2.b3d
index c128650..c128650 100644
--- a/models/advtrains_dtrack_vst2.b3d
+++ b/advtrains/models/advtrains_dtrack_vst2.b3d
diff --git a/models/advtrains_dtrack_vst2_45.b3d b/advtrains/models/advtrains_dtrack_vst2_45.b3d
index 263276d..263276d 100644
--- a/models/advtrains_dtrack_vst2_45.b3d
+++ b/advtrains/models/advtrains_dtrack_vst2_45.b3d
diff --git a/models/advtrains_dtrack_vst31.b3d b/advtrains/models/advtrains_dtrack_vst31.b3d
index df0f383..df0f383 100644
--- a/models/advtrains_dtrack_vst31.b3d
+++ b/advtrains/models/advtrains_dtrack_vst31.b3d
diff --git a/models/advtrains_dtrack_vst32.b3d b/advtrains/models/advtrains_dtrack_vst32.b3d
index 01d2978..01d2978 100644
--- a/models/advtrains_dtrack_vst32.b3d
+++ b/advtrains/models/advtrains_dtrack_vst32.b3d
diff --git a/models/advtrains_dtrack_vst33.b3d b/advtrains/models/advtrains_dtrack_vst33.b3d
index 7fe418d..7fe418d 100644
--- a/models/advtrains_dtrack_vst33.b3d
+++ b/advtrains/models/advtrains_dtrack_vst33.b3d
diff --git a/models/advtrains_modernwagon.b3d b/advtrains/models/advtrains_modernwagon.b3d
index aacddca..aacddca 100644
--- a/models/advtrains_modernwagon.b3d
+++ b/advtrains/models/advtrains_modernwagon.b3d
diff --git a/models/advtrains_retrosignal_off.b3d b/advtrains/models/advtrains_retrosignal_off.b3d
index 3d231dd..3d231dd 100644
--- a/models/advtrains_retrosignal_off.b3d
+++ b/advtrains/models/advtrains_retrosignal_off.b3d
diff --git a/models/advtrains_retrosignal_off_30.b3d b/advtrains/models/advtrains_retrosignal_off_30.b3d
index da258e1..da258e1 100644
--- a/models/advtrains_retrosignal_off_30.b3d
+++ b/advtrains/models/advtrains_retrosignal_off_30.b3d
diff --git a/models/advtrains_retrosignal_off_45.b3d b/advtrains/models/advtrains_retrosignal_off_45.b3d
index 338224a..338224a 100644
--- a/models/advtrains_retrosignal_off_45.b3d
+++ b/advtrains/models/advtrains_retrosignal_off_45.b3d
diff --git a/models/advtrains_retrosignal_off_60.b3d b/advtrains/models/advtrains_retrosignal_off_60.b3d
index c560ca1..c560ca1 100644
--- a/models/advtrains_retrosignal_off_60.b3d
+++ b/advtrains/models/advtrains_retrosignal_off_60.b3d
diff --git a/models/advtrains_retrosignal_on.b3d b/advtrains/models/advtrains_retrosignal_on.b3d
index 3d19439..3d19439 100644
--- a/models/advtrains_retrosignal_on.b3d
+++ b/advtrains/models/advtrains_retrosignal_on.b3d
diff --git a/models/advtrains_retrosignal_on_30.b3d b/advtrains/models/advtrains_retrosignal_on_30.b3d
index 98f8a92..98f8a92 100644
--- a/models/advtrains_retrosignal_on_30.b3d
+++ b/advtrains/models/advtrains_retrosignal_on_30.b3d
diff --git a/models/advtrains_retrosignal_on_45.b3d b/advtrains/models/advtrains_retrosignal_on_45.b3d
index 414e121..414e121 100644
--- a/models/advtrains_retrosignal_on_45.b3d
+++ b/advtrains/models/advtrains_retrosignal_on_45.b3d
diff --git a/models/advtrains_retrosignal_on_60.b3d b/advtrains/models/advtrains_retrosignal_on_60.b3d
index a51529a..a51529a 100644
--- a/models/advtrains_retrosignal_on_60.b3d
+++ b/advtrains/models/advtrains_retrosignal_on_60.b3d
diff --git a/models/advtrains_signal.b3d b/advtrains/models/advtrains_signal.b3d
index 7f69560..7f69560 100644
--- a/models/advtrains_signal.b3d
+++ b/advtrains/models/advtrains_signal.b3d
diff --git a/models/advtrains_signal_30.b3d b/advtrains/models/advtrains_signal_30.b3d
index 0b949a7..0b949a7 100644
--- a/models/advtrains_signal_30.b3d
+++ b/advtrains/models/advtrains_signal_30.b3d
diff --git a/models/advtrains_signal_45.b3d b/advtrains/models/advtrains_signal_45.b3d
index ccaebf4..ccaebf4 100644
--- a/models/advtrains_signal_45.b3d
+++ b/advtrains/models/advtrains_signal_45.b3d
diff --git a/models/advtrains_signal_60.b3d b/advtrains/models/advtrains_signal_60.b3d
index cf41e6d..cf41e6d 100644
--- a/models/advtrains_signal_60.b3d
+++ b/advtrains/models/advtrains_signal_60.b3d
diff --git a/models/advtrains_track_cr.b3d b/advtrains/models/advtrains_track_cr.b3d
index b0f5e4b..b0f5e4b 100644
--- a/models/advtrains_track_cr.b3d
+++ b/advtrains/models/advtrains_track_cr.b3d
diff --git a/models/advtrains_track_st.b3d b/advtrains/models/advtrains_track_st.b3d
index 10b5d90..10b5d90 100644
--- a/models/advtrains_track_st.b3d
+++ b/advtrains/models/advtrains_track_st.b3d
diff --git a/models/advtrains_track_st_45.b3d b/advtrains/models/advtrains_track_st_45.b3d
index 32505a1..32505a1 100644
--- a/models/advtrains_track_st_45.b3d
+++ b/advtrains/models/advtrains_track_st_45.b3d
diff --git a/models/blender/engine-with-animation.blend b/advtrains/models/blender/engine-with-animation.blend
index 2649587..2649587 100644
--- a/models/blender/engine-with-animation.blend
+++ b/advtrains/models/blender/engine-with-animation.blend
diff --git a/models/blender/gleis/infos/Grafik_weiche.png b/advtrains/models/blender/gleis/infos/Grafik_weiche.png
index 6674eb3..6674eb3 100644
--- a/models/blender/gleis/infos/Grafik_weiche.png
+++ b/advtrains/models/blender/gleis/infos/Grafik_weiche.png
diff --git a/models/blender/gleis/infos/breite b/advtrains/models/blender/gleis/infos/breite
index b2862c6..b2862c6 100644
--- a/models/blender/gleis/infos/breite
+++ b/advtrains/models/blender/gleis/infos/breite
diff --git a/models/blender/gleis/licence.txt~ b/advtrains/models/blender/gleis/licence.txt~
index e69de29..e69de29 100644
--- a/models/blender/gleis/licence.txt~
+++ b/advtrains/models/blender/gleis/licence.txt~
diff --git a/models/blender/gleis/rail_my.blend b/advtrains/models/blender/gleis/rail_my.blend
index 3c741bc..3c741bc 100644
--- a/models/blender/gleis/rail_my.blend
+++ b/advtrains/models/blender/gleis/rail_my.blend
diff --git a/models/blender/gleis/rail_my.blend1 b/advtrains/models/blender/gleis/rail_my.blend1
index 6322856..6322856 100644
--- a/models/blender/gleis/rail_my.blend1
+++ b/advtrains/models/blender/gleis/rail_my.blend1
diff --git a/models/blender/gleis/rail_my_rt.blend b/advtrains/models/blender/gleis/rail_my_rt.blend
index 8372a0c..8372a0c 100644
--- a/models/blender/gleis/rail_my_rt.blend
+++ b/advtrains/models/blender/gleis/rail_my_rt.blend
diff --git a/models/blender/gleis/rail_my_rt.blend1 b/advtrains/models/blender/gleis/rail_my_rt.blend1
index 7d0978e..7d0978e 100644
--- a/models/blender/gleis/rail_my_rt.blend1
+++ b/advtrains/models/blender/gleis/rail_my_rt.blend1
diff --git a/models/blender/gleis/rail_my_rt_final.blend b/advtrains/models/blender/gleis/rail_my_rt_final.blend
index 6a9a088..6a9a088 100644
--- a/models/blender/gleis/rail_my_rt_final.blend
+++ b/advtrains/models/blender/gleis/rail_my_rt_final.blend
diff --git a/models/blender/gleis/rail_my_rt_final.blend1 b/advtrains/models/blender/gleis/rail_my_rt_final.blend1
index 1f346ae..1f346ae 100644
--- a/models/blender/gleis/rail_my_rt_final.blend1
+++ b/advtrains/models/blender/gleis/rail_my_rt_final.blend1
diff --git a/models/blender/gleis/rail_my_rt_switches.blend b/advtrains/models/blender/gleis/rail_my_rt_switches.blend
index fdce427..fdce427 100644
--- a/models/blender/gleis/rail_my_rt_switches.blend
+++ b/advtrains/models/blender/gleis/rail_my_rt_switches.blend
diff --git a/models/blender/gleis/rail_my_rt_switches.blend1 b/advtrains/models/blender/gleis/rail_my_rt_switches.blend1
index 04370ba..04370ba 100644
--- a/models/blender/gleis/rail_my_rt_switches.blend1
+++ b/advtrains/models/blender/gleis/rail_my_rt_switches.blend1
diff --git a/models/blender/gleis/rail_my_rt_switches2.blend b/advtrains/models/blender/gleis/rail_my_rt_switches2.blend
index 9562e4d..9562e4d 100644
--- a/models/blender/gleis/rail_my_rt_switches2.blend
+++ b/advtrains/models/blender/gleis/rail_my_rt_switches2.blend
diff --git a/models/blender/gleis/rail_my_rt_switches2.blend1 b/advtrains/models/blender/gleis/rail_my_rt_switches2.blend1
index 07a155f..07a155f 100644
--- a/models/blender/gleis/rail_my_rt_switches2.blend1
+++ b/advtrains/models/blender/gleis/rail_my_rt_switches2.blend1
diff --git a/models/blender/gleis/rail_together.blend b/advtrains/models/blender/gleis/rail_together.blend
index cff51ea..cff51ea 100644
--- a/models/blender/gleis/rail_together.blend
+++ b/advtrains/models/blender/gleis/rail_together.blend
diff --git a/models/blender/gleis/rail_together.png b/advtrains/models/blender/gleis/rail_together.png
index 386cd5c..386cd5c 100644
--- a/models/blender/gleis/rail_together.png
+++ b/advtrains/models/blender/gleis/rail_together.png
diff --git a/models/blender/gleis/rail_together2.png b/advtrains/models/blender/gleis/rail_together2.png
index 3effe34..3effe34 100644
--- a/models/blender/gleis/rail_together2.png
+++ b/advtrains/models/blender/gleis/rail_together2.png
diff --git a/models/blender/gleis/rail_together3.png b/advtrains/models/blender/gleis/rail_together3.png
index 4a183c1..4a183c1 100644
--- a/models/blender/gleis/rail_together3.png
+++ b/advtrains/models/blender/gleis/rail_together3.png
diff --git a/models/blender/gleis/rail_verticals.blend b/advtrains/models/blender/gleis/rail_verticals.blend
index 45c37e1..45c37e1 100644
--- a/models/blender/gleis/rail_verticals.blend
+++ b/advtrains/models/blender/gleis/rail_verticals.blend
diff --git a/models/blender/gleis/rail_verticals.blend1 b/advtrains/models/blender/gleis/rail_verticals.blend1
index 320f30b..320f30b 100644
--- a/models/blender/gleis/rail_verticals.blend1
+++ b/advtrains/models/blender/gleis/rail_verticals.blend1
diff --git a/models/blender/gleis/rail_verticals3.blend b/advtrains/models/blender/gleis/rail_verticals3.blend
index 5d62959..5d62959 100644
--- a/models/blender/gleis/rail_verticals3.blend
+++ b/advtrains/models/blender/gleis/rail_verticals3.blend
diff --git a/models/blender/gleis/rail_verticals3.blend1 b/advtrains/models/blender/gleis/rail_verticals3.blend1
index 893f2ea..893f2ea 100644
--- a/models/blender/gleis/rail_verticals3.blend1
+++ b/advtrains/models/blender/gleis/rail_verticals3.blend1
diff --git a/models/blender/gleis/rail_verticals45.blend b/advtrains/models/blender/gleis/rail_verticals45.blend
index a1589e3..a1589e3 100644
--- a/models/blender/gleis/rail_verticals45.blend
+++ b/advtrains/models/blender/gleis/rail_verticals45.blend
diff --git a/models/blender/gleis/rail_verticals45.blend1 b/advtrains/models/blender/gleis/rail_verticals45.blend1
index 6b44d1c..6b44d1c 100644
--- a/models/blender/gleis/rail_verticals45.blend1
+++ b/advtrains/models/blender/gleis/rail_verticals45.blend1
diff --git a/models/blender/gleis/rail_verticals45.blend11 b/advtrains/models/blender/gleis/rail_verticals45.blend11
index 48316e8..48316e8 100644
--- a/models/blender/gleis/rail_verticals45.blend11
+++ b/advtrains/models/blender/gleis/rail_verticals45.blend11
diff --git a/models/blender/gleis/texturen/rail.png b/advtrains/models/blender/gleis/texturen/rail.png
index 8478cf6..8478cf6 100644
--- a/models/blender/gleis/texturen/rail.png
+++ b/advtrains/models/blender/gleis/texturen/rail.png
diff --git a/models/blender/gleis/texturen/uv.png b/advtrains/models/blender/gleis/texturen/uv.png
index fb0af3e..fb0af3e 100644
--- a/models/blender/gleis/texturen/uv.png
+++ b/advtrains/models/blender/gleis/texturen/uv.png
diff --git a/models/blender/industrial/industry_loc.blend b/advtrains/models/blender/industrial/industry_loc.blend
index 1a6cb2b..1a6cb2b 100644
--- a/models/blender/industrial/industry_loc.blend
+++ b/advtrains/models/blender/industrial/industry_loc.blend
diff --git a/models/blender/industrial/industry_loc.blend1 b/advtrains/models/blender/industrial/industry_loc.blend1
index af54c3f..af54c3f 100644
--- a/models/blender/industrial/industry_loc.blend1
+++ b/advtrains/models/blender/industrial/industry_loc.blend1
diff --git a/models/blender/industrial/industry_loc.blend11 b/advtrains/models/blender/industrial/industry_loc.blend11
index a089a65..a089a65 100644
--- a/models/blender/industrial/industry_loc.blend11
+++ b/advtrains/models/blender/industrial/industry_loc.blend11
diff --git a/models/blender/industrial/industry_oil_ wagong.blend b/advtrains/models/blender/industrial/industry_oil_ wagong.blend
index 30bde51..30bde51 100644
--- a/models/blender/industrial/industry_oil_ wagong.blend
+++ b/advtrains/models/blender/industrial/industry_oil_ wagong.blend
diff --git a/models/blender/industrial/industry_oil_ wagong.blend1 b/advtrains/models/blender/industrial/industry_oil_ wagong.blend1
index 849971d..849971d 100644
--- a/models/blender/industrial/industry_oil_ wagong.blend1
+++ b/advtrains/models/blender/industrial/industry_oil_ wagong.blend1
diff --git a/models/blender/industrial/industry_tree_wagong.blend b/advtrains/models/blender/industrial/industry_tree_wagong.blend
index 23de208..23de208 100644
--- a/models/blender/industrial/industry_tree_wagong.blend
+++ b/advtrains/models/blender/industrial/industry_tree_wagong.blend
diff --git a/models/blender/industrial/industry_tree_wagong.blend1 b/advtrains/models/blender/industrial/industry_tree_wagong.blend1
index bf2c9ed..bf2c9ed 100644
--- a/models/blender/industrial/industry_tree_wagong.blend1
+++ b/advtrains/models/blender/industrial/industry_tree_wagong.blend1
diff --git a/models/blender/industrial/industry_tree_wagong.png b/advtrains/models/blender/industrial/industry_tree_wagong.png
index 87109dd..87109dd 100644
--- a/models/blender/industrial/industry_tree_wagong.png
+++ b/advtrains/models/blender/industrial/industry_tree_wagong.png
diff --git a/models/blender/locomotive.blend b/advtrains/models/blender/locomotive.blend
index 8fd6059..8fd6059 100644
--- a/models/blender/locomotive.blend
+++ b/advtrains/models/blender/locomotive.blend
diff --git a/models/blender/magnet_track.blend b/advtrains/models/blender/magnet_track.blend
index 0ab14e7..0ab14e7 100644
--- a/models/blender/magnet_track.blend
+++ b/advtrains/models/blender/magnet_track.blend
diff --git a/models/blender/mbb/advtrains_wagon_japan.xcf b/advtrains/models/blender/mbb/advtrains_wagon_japan.xcf
index 4fc88c0..4fc88c0 100644
--- a/models/blender/mbb/advtrains_wagon_japan.xcf
+++ b/advtrains/models/blender/mbb/advtrains_wagon_japan.xcf
diff --git a/models/blender/mbb/modern_japanlocomotive.blend b/advtrains/models/blender/mbb/modern_japanlocomotive.blend
index 6eb8f3d..6eb8f3d 100644
--- a/models/blender/mbb/modern_japanlocomotive.blend
+++ b/advtrains/models/blender/mbb/modern_japanlocomotive.blend
diff --git a/models/blender/mbb/modern_japanlocomotive.blend1 b/advtrains/models/blender/mbb/modern_japanlocomotive.blend1
index a2e745d..a2e745d 100644
--- a/models/blender/mbb/modern_japanlocomotive.blend1
+++ b/advtrains/models/blender/mbb/modern_japanlocomotive.blend1
diff --git a/models/blender/mbb/modern_japanlocomotive.png b/advtrains/models/blender/mbb/modern_japanlocomotive.png
index b80d16f..b80d16f 100644
--- a/models/blender/mbb/modern_japanlocomotive.png
+++ b/advtrains/models/blender/mbb/modern_japanlocomotive.png
diff --git a/models/blender/mbb/modern_japanlocomotive.xcf b/advtrains/models/blender/mbb/modern_japanlocomotive.xcf
index bb28534..bb28534 100644
--- a/models/blender/mbb/modern_japanlocomotive.xcf
+++ b/advtrains/models/blender/mbb/modern_japanlocomotive.xcf
diff --git a/models/blender/mbb/modern_locomotive.blend b/advtrains/models/blender/mbb/modern_locomotive.blend
index 8e72233..8e72233 100644
--- a/models/blender/mbb/modern_locomotive.blend
+++ b/advtrains/models/blender/mbb/modern_locomotive.blend
diff --git a/models/blender/mbb/modern_wagong.blend b/advtrains/models/blender/mbb/modern_wagong.blend
index f32710a..f32710a 100644
--- a/models/blender/mbb/modern_wagong.blend
+++ b/advtrains/models/blender/mbb/modern_wagong.blend
diff --git a/models/blender/mbb/modern_wagong.blend1 b/advtrains/models/blender/mbb/modern_wagong.blend1
index 376831c..376831c 100644
--- a/models/blender/mbb/modern_wagong.blend1
+++ b/advtrains/models/blender/mbb/modern_wagong.blend1
diff --git a/models/blender/mbb/modern_wagong_uv.blend b/advtrains/models/blender/mbb/modern_wagong_uv.blend
index 4c10fb3..4c10fb3 100644
--- a/models/blender/mbb/modern_wagong_uv.blend
+++ b/advtrains/models/blender/mbb/modern_wagong_uv.blend
diff --git a/models/blender/mbb/modern_wagong_uv.blend1 b/advtrains/models/blender/mbb/modern_wagong_uv.blend1
index ce77416..ce77416 100644
--- a/models/blender/mbb/modern_wagong_uv.blend1
+++ b/advtrains/models/blender/mbb/modern_wagong_uv.blend1
diff --git a/models/blender/mbb/modern_wagong_uv.png b/advtrains/models/blender/mbb/modern_wagong_uv.png
index 68018ea..68018ea 100644
--- a/models/blender/mbb/modern_wagong_uv.png
+++ b/advtrains/models/blender/mbb/modern_wagong_uv.png
diff --git a/models/blender/mbb/prellbock.blend b/advtrains/models/blender/mbb/prellbock.blend
index 1c20ab2..1c20ab2 100644
--- a/models/blender/mbb/prellbock.blend
+++ b/advtrains/models/blender/mbb/prellbock.blend
diff --git a/models/blender/mbb/prellbock.blend1 b/advtrains/models/blender/mbb/prellbock.blend1
index 981538e..981538e 100644
--- a/models/blender/mbb/prellbock.blend1
+++ b/advtrains/models/blender/mbb/prellbock.blend1
diff --git a/models/blender/mbb/prellbock.uv.png b/advtrains/models/blender/mbb/prellbock.uv.png
index 7730753..7730753 100644
--- a/models/blender/mbb/prellbock.uv.png
+++ b/advtrains/models/blender/mbb/prellbock.uv.png
diff --git a/models/blender/mbb/regio-lokomotive.blend b/advtrains/models/blender/mbb/regio-lokomotive.blend
index 210e60e..210e60e 100644
--- a/models/blender/mbb/regio-lokomotive.blend
+++ b/advtrains/models/blender/mbb/regio-lokomotive.blend
diff --git a/models/blender/mbb/regio-waron.blend b/advtrains/models/blender/mbb/regio-waron.blend
index 19b07ce..19b07ce 100644
--- a/models/blender/mbb/regio-waron.blend
+++ b/advtrains/models/blender/mbb/regio-waron.blend
diff --git a/models/blender/mbb/retrosignal.blend b/advtrains/models/blender/mbb/retrosignal.blend
index b795215..b795215 100644
--- a/models/blender/mbb/retrosignal.blend
+++ b/advtrains/models/blender/mbb/retrosignal.blend
diff --git a/models/blender/mbb/retrosignal.blend1 b/advtrains/models/blender/mbb/retrosignal.blend1
index 94af470..94af470 100644
--- a/models/blender/mbb/retrosignal.blend1
+++ b/advtrains/models/blender/mbb/retrosignal.blend1
diff --git a/models/blender/mbb/signal(2)_hoch.blend b/advtrains/models/blender/mbb/signal(2)_hoch.blend
index 70391f6..70391f6 100644
--- a/models/blender/mbb/signal(2)_hoch.blend
+++ b/advtrains/models/blender/mbb/signal(2)_hoch.blend
diff --git a/models/blender/mbb/signal(2)_unten.blend b/advtrains/models/blender/mbb/signal(2)_unten.blend
index 4e917bc..4e917bc 100644
--- a/models/blender/mbb/signal(2)_unten.blend
+++ b/advtrains/models/blender/mbb/signal(2)_unten.blend
diff --git a/models/blender/mbb/signal.blend b/advtrains/models/blender/mbb/signal.blend
index 135c7b4..135c7b4 100644
--- a/models/blender/mbb/signal.blend
+++ b/advtrains/models/blender/mbb/signal.blend
diff --git a/models/blender/mbb/signal.blend1 b/advtrains/models/blender/mbb/signal.blend1
index 63a8c99..63a8c99 100644
--- a/models/blender/mbb/signal.blend1
+++ b/advtrains/models/blender/mbb/signal.blend1
diff --git a/models/blender/mbb/signal.png b/advtrains/models/blender/mbb/signal.png
index 779cdda..779cdda 100644
--- a/models/blender/mbb/signal.png
+++ b/advtrains/models/blender/mbb/signal.png
diff --git a/models/blender/mbb/signal.xcf b/advtrains/models/blender/mbb/signal.xcf
index f667739..f667739 100644
--- a/models/blender/mbb/signal.xcf
+++ b/advtrains/models/blender/mbb/signal.xcf
diff --git a/models/blender/mbb/signal2.png b/advtrains/models/blender/mbb/signal2.png
index 7af4e2d..7af4e2d 100644
--- a/models/blender/mbb/signal2.png
+++ b/advtrains/models/blender/mbb/signal2.png
diff --git a/models/blender/mbb/tr-logo.png b/advtrains/models/blender/mbb/tr-logo.png
index 9bc0f10..9bc0f10 100644
--- a/models/blender/mbb/tr-logo.png
+++ b/advtrains/models/blender/mbb/tr-logo.png
diff --git a/models/blender/mbb/weichenhebel1.blend b/advtrains/models/blender/mbb/weichenhebel1.blend
index 70b997d..70b997d 100644
--- a/models/blender/mbb/weichenhebel1.blend
+++ b/advtrains/models/blender/mbb/weichenhebel1.blend
diff --git a/models/blender/mbb/weichenhebel2.blend b/advtrains/models/blender/mbb/weichenhebel2.blend
index c1c3aac..c1c3aac 100644
--- a/models/blender/mbb/weichenhebel2.blend
+++ b/advtrains/models/blender/mbb/weichenhebel2.blend
diff --git a/models/blender/newlocomotive.blend b/advtrains/models/blender/newlocomotive.blend
index 858882b..858882b 100644
--- a/models/blender/newlocomotive.blend
+++ b/advtrains/models/blender/newlocomotive.blend
diff --git a/models/blender/newlocomotive.blend1 b/advtrains/models/blender/newlocomotive.blend1
index 4b8b24f..4b8b24f 100644
--- a/models/blender/newlocomotive.blend1
+++ b/advtrains/models/blender/newlocomotive.blend1
diff --git a/models/blender/newlocomotive_uvs.png b/advtrains/models/blender/newlocomotive_uvs.png
index 879be65..879be65 100644
--- a/models/blender/newlocomotive_uvs.png
+++ b/advtrains/models/blender/newlocomotive_uvs.png
diff --git a/models/blender/newwagon.blend b/advtrains/models/blender/newwagon.blend
index 1cedc55..1cedc55 100644
--- a/models/blender/newwagon.blend
+++ b/advtrains/models/blender/newwagon.blend
diff --git a/models/blender/newwagon.blend1 b/advtrains/models/blender/newwagon.blend1
index eb30fde..eb30fde 100644
--- a/models/blender/newwagon.blend1
+++ b/advtrains/models/blender/newwagon.blend1
diff --git a/models/blender/newwagon.png b/advtrains/models/blender/newwagon.png
index 812bc32..812bc32 100644
--- a/models/blender/newwagon.png
+++ b/advtrains/models/blender/newwagon.png
diff --git a/models/blender/subway-train.blend b/advtrains/models/blender/subway-train.blend
index 690d87b..690d87b 100644
--- a/models/blender/subway-train.blend
+++ b/advtrains/models/blender/subway-train.blend
diff --git a/models/blender/subway-train.blend1 b/advtrains/models/blender/subway-train.blend1
index 86d1f92..86d1f92 100644
--- a/models/blender/subway-train.blend1
+++ b/advtrains/models/blender/subway-train.blend1
diff --git a/models/blender/subway-train.png b/advtrains/models/blender/subway-train.png
index d0b9731..d0b9731 100644
--- a/models/blender/subway-train.png
+++ b/advtrains/models/blender/subway-train.png
diff --git a/models/blender/subway-train.xcf b/advtrains/models/blender/subway-train.xcf
index 775b87c..775b87c 100644
--- a/models/blender/subway-train.xcf
+++ b/advtrains/models/blender/subway-train.xcf
diff --git a/models/blender/trackplane.blend b/advtrains/models/blender/trackplane.blend
index 79365f7..79365f7 100644
--- a/models/blender/trackplane.blend
+++ b/advtrains/models/blender/trackplane.blend
diff --git a/models/blender/trackvertical1.blend b/advtrains/models/blender/trackvertical1.blend
index fca6742..fca6742 100644
--- a/models/blender/trackvertical1.blend
+++ b/advtrains/models/blender/trackvertical1.blend
diff --git a/models/blender/trackvertical1.blend1 b/advtrains/models/blender/trackvertical1.blend1
index b146b56..b146b56 100644
--- a/models/blender/trackvertical1.blend1
+++ b/advtrains/models/blender/trackvertical1.blend1
diff --git a/models/blender/trackvertical1.png b/advtrains/models/blender/trackvertical1.png
index a998dcb..a998dcb 100644
--- a/models/blender/trackvertical1.png
+++ b/advtrains/models/blender/trackvertical1.png
diff --git a/models/blender/trackvertical2.blend b/advtrains/models/blender/trackvertical2.blend
index a066b84..a066b84 100644
--- a/models/blender/trackvertical2.blend
+++ b/advtrains/models/blender/trackvertical2.blend
diff --git a/models/blender/trackvertical2.png b/advtrains/models/blender/trackvertical2.png
index 43142f9..43142f9 100644
--- a/models/blender/trackvertical2.png
+++ b/advtrains/models/blender/trackvertical2.png
diff --git a/models/oldmodels/locomotive.b3d b/advtrains/models/oldmodels/locomotive.b3d
index 5e16be3..5e16be3 100644
--- a/models/oldmodels/locomotive.b3d
+++ b/advtrains/models/oldmodels/locomotive.b3d
diff --git a/models/oldmodels/trackvertical1.b3d b/advtrains/models/oldmodels/trackvertical1.b3d
index 5620f60..5620f60 100644
--- a/models/oldmodels/trackvertical1.b3d
+++ b/advtrains/models/oldmodels/trackvertical1.b3d
diff --git a/models/oldmodels/trackvertical2.b3d b/advtrains/models/oldmodels/trackvertical2.b3d
index 22dbb20..22dbb20 100644
--- a/models/oldmodels/trackvertical2.b3d
+++ b/advtrains/models/oldmodels/trackvertical2.b3d
diff --git a/models/trackplane.b3d b/advtrains/models/trackplane.b3d
index b4728c3..b4728c3 100644
--- a/models/trackplane.b3d
+++ b/advtrains/models/trackplane.b3d
diff --git a/pseudoload.lua b/advtrains/pseudoload.lua
index 8511811..8511811 100644
--- a/pseudoload.lua
+++ b/advtrains/pseudoload.lua
diff --git a/readme.txt b/advtrains/readme.txt
index ad093bd..ad093bd 100644
--- a/readme.txt
+++ b/advtrains/readme.txt
diff --git a/signals.lua b/advtrains/signals.lua
index 8be65e0..8be65e0 100644
--- a/signals.lua
+++ b/advtrains/signals.lua
diff --git a/textures/advtrains_couple.png b/advtrains/textures/advtrains_couple.png
index 9e997e4..9e997e4 100644
--- a/textures/advtrains_couple.png
+++ b/advtrains/textures/advtrains_couple.png
diff --git a/textures/advtrains_discouple.png b/advtrains/textures/advtrains_discouple.png
index b27c4fb..b27c4fb 100644
--- a/textures/advtrains_discouple.png
+++ b/advtrains/textures/advtrains_discouple.png
diff --git a/textures/advtrains_dtrack_bumper_placer.png b/advtrains/textures/advtrains_dtrack_bumper_placer.png
index 27191fe..27191fe 100644
--- a/textures/advtrains_dtrack_bumper_placer.png
+++ b/advtrains/textures/advtrains_dtrack_bumper_placer.png
diff --git a/textures/advtrains_dtrack_detector_placer.png b/advtrains/textures/advtrains_dtrack_detector_placer.png
index e6c6ad6..e6c6ad6 100644
--- a/textures/advtrains_dtrack_detector_placer.png
+++ b/advtrains/textures/advtrains_dtrack_detector_placer.png
diff --git a/textures/advtrains_dtrack_placer.png b/advtrains/textures/advtrains_dtrack_placer.png
index c49777c..c49777c 100644
--- a/textures/advtrains_dtrack_placer.png
+++ b/advtrains/textures/advtrains_dtrack_placer.png
diff --git a/textures/advtrains_dtrack_rail.png b/advtrains/textures/advtrains_dtrack_rail.png
index 568e533..568e533 100644
--- a/textures/advtrains_dtrack_rail.png
+++ b/advtrains/textures/advtrains_dtrack_rail.png
diff --git a/textures/advtrains_dtrack_rail_detector_on.png b/advtrains/textures/advtrains_dtrack_rail_detector_on.png
index 3ae0dac..3ae0dac 100644
--- a/textures/advtrains_dtrack_rail_detector_on.png
+++ b/advtrains/textures/advtrains_dtrack_rail_detector_on.png
diff --git a/textures/advtrains_dtrack_slopeplacer.png b/advtrains/textures/advtrains_dtrack_slopeplacer.png
index 1d456b0..1d456b0 100644
--- a/textures/advtrains_dtrack_slopeplacer.png
+++ b/advtrains/textures/advtrains_dtrack_slopeplacer.png
diff --git a/textures/advtrains_newlocomotive.xcf b/advtrains/textures/advtrains_newlocomotive.xcf
index 9ad5187..9ad5187 100644
--- a/textures/advtrains_newlocomotive.xcf
+++ b/advtrains/textures/advtrains_newlocomotive.xcf
diff --git a/textures/advtrains_platform.png b/advtrains/textures/advtrains_platform.png
index 5ba9663..5ba9663 100644
--- a/textures/advtrains_platform.png
+++ b/advtrains/textures/advtrains_platform.png
diff --git a/textures/advtrains_retrosignal.png b/advtrains/textures/advtrains_retrosignal.png
index 141198d..141198d 100644
--- a/textures/advtrains_retrosignal.png
+++ b/advtrains/textures/advtrains_retrosignal.png
diff --git a/textures/advtrains_retrosignal_inv.png b/advtrains/textures/advtrains_retrosignal_inv.png
index 1036594..1036594 100644
--- a/textures/advtrains_retrosignal_inv.png
+++ b/advtrains/textures/advtrains_retrosignal_inv.png
diff --git a/textures/advtrains_signal_inv.png b/advtrains/textures/advtrains_signal_inv.png
index ed64ed9..ed64ed9 100644
--- a/textures/advtrains_signal_inv.png
+++ b/advtrains/textures/advtrains_signal_inv.png
diff --git a/textures/advtrains_signal_off.png b/advtrains/textures/advtrains_signal_off.png
index 8046e52..8046e52 100644
--- a/textures/advtrains_signal_off.png
+++ b/advtrains/textures/advtrains_signal_off.png
diff --git a/textures/advtrains_signal_on.png b/advtrains/textures/advtrains_signal_on.png
index 5228bb3..5228bb3 100644
--- a/textures/advtrains_signal_on.png
+++ b/advtrains/textures/advtrains_signal_on.png
diff --git a/textures/advtrains_track_cr.png b/advtrains/textures/advtrains_track_cr.png
index 40f0cc5..40f0cc5 100644
--- a/textures/advtrains_track_cr.png
+++ b/advtrains/textures/advtrains_track_cr.png
diff --git a/textures/advtrains_track_cr_45.png b/advtrains/textures/advtrains_track_cr_45.png
index 54966b3..54966b3 100644
--- a/textures/advtrains_track_cr_45.png
+++ b/advtrains/textures/advtrains_track_cr_45.png
diff --git a/textures/advtrains_track_placer.png b/advtrains/textures/advtrains_track_placer.png
index 03e17ed..03e17ed 100644
--- a/textures/advtrains_track_placer.png
+++ b/advtrains/textures/advtrains_track_placer.png
diff --git a/textures/advtrains_track_st.png b/advtrains/textures/advtrains_track_st.png
index 5ad7e4f..5ad7e4f 100644
--- a/textures/advtrains_track_st.png
+++ b/advtrains/textures/advtrains_track_st.png
diff --git a/textures/advtrains_track_st_45.png b/advtrains/textures/advtrains_track_st_45.png
index 63b4c96..63b4c96 100644
--- a/textures/advtrains_track_st_45.png
+++ b/advtrains/textures/advtrains_track_st_45.png
diff --git a/textures/advtrains_track_swlcr.png b/advtrains/textures/advtrains_track_swlcr.png
index d9b5c0b..d9b5c0b 100644
--- a/textures/advtrains_track_swlcr.png
+++ b/advtrains/textures/advtrains_track_swlcr.png
diff --git a/textures/advtrains_track_swlcr_45.png b/advtrains/textures/advtrains_track_swlcr_45.png
index f098fc9..f098fc9 100644
--- a/textures/advtrains_track_swlcr_45.png
+++ b/advtrains/textures/advtrains_track_swlcr_45.png
diff --git a/textures/advtrains_track_swlst.png b/advtrains/textures/advtrains_track_swlst.png
index 314bd2d..314bd2d 100644
--- a/textures/advtrains_track_swlst.png
+++ b/advtrains/textures/advtrains_track_swlst.png
diff --git a/textures/advtrains_track_swlst_45.png b/advtrains/textures/advtrains_track_swlst_45.png
index 765d0ec..765d0ec 100644
--- a/textures/advtrains_track_swlst_45.png
+++ b/advtrains/textures/advtrains_track_swlst_45.png
diff --git a/textures/advtrains_track_swrcr.png b/advtrains/textures/advtrains_track_swrcr.png
index f74e1bc..f74e1bc 100644
--- a/textures/advtrains_track_swrcr.png
+++ b/advtrains/textures/advtrains_track_swrcr.png
diff --git a/textures/advtrains_track_swrcr_45.png b/advtrains/textures/advtrains_track_swrcr_45.png
index fa432aa..fa432aa 100644
--- a/textures/advtrains_track_swrcr_45.png
+++ b/advtrains/textures/advtrains_track_swrcr_45.png
diff --git a/textures/advtrains_track_swrst.png b/advtrains/textures/advtrains_track_swrst.png
index 06ea29e..06ea29e 100644
--- a/textures/advtrains_track_swrst.png
+++ b/advtrains/textures/advtrains_track_swrst.png
diff --git a/textures/advtrains_track_swrst_45.png b/advtrains/textures/advtrains_track_swrst_45.png
index be477b7..be477b7 100644
--- a/textures/advtrains_track_swrst_45.png
+++ b/advtrains/textures/advtrains_track_swrst_45.png
diff --git a/textures/advtrains_trackworker.png b/advtrains/textures/advtrains_trackworker.png
index b50bcae..b50bcae 100644
--- a/textures/advtrains_trackworker.png
+++ b/advtrains/textures/advtrains_trackworker.png
diff --git a/textures/drwho_screwdriver.png b/advtrains/textures/drwho_screwdriver.png
index b50bcae..b50bcae 100644
--- a/textures/drwho_screwdriver.png
+++ b/advtrains/textures/drwho_screwdriver.png
diff --git a/textures/larger rails.xcf b/advtrains/textures/larger rails.xcf
index 42ae592..42ae592 100644
--- a/textures/larger rails.xcf
+++ b/advtrains/textures/larger rails.xcf
diff --git a/trackplacer.lua b/advtrains/trackplacer.lua
index eebf2ae..eebf2ae 100644
--- a/trackplacer.lua
+++ b/advtrains/trackplacer.lua
diff --git a/tracks.lua b/advtrains/tracks.lua
index 99dbb27..99dbb27 100644
--- a/tracks.lua
+++ b/advtrains/tracks.lua
diff --git a/trainhud.lua b/advtrains/trainhud.lua
index aead246..aead246 100644
--- a/trainhud.lua
+++ b/advtrains/trainhud.lua
diff --git a/trainlogic.lua b/advtrains/trainlogic.lua
index 5e3936f..5e3936f 100644
--- a/trainlogic.lua
+++ b/advtrains/trainlogic.lua
diff --git a/wagons.lua b/advtrains/wagons.lua
index ca31590..03eae34 100644
--- a/wagons.lua
+++ b/advtrains/wagons.lua
@@ -491,7 +491,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 					end

 				elseif fields.seat then

 					local val=minetest.explode_textlist_event(fields.seat)

-					if val and val.type~="INV" then

+					if val and val.type~="INV" and not self.seatp[player:get_player_name()] then

 					--get on

 						wagon:get_on(player, val.index)

 						--will work with the new close_formspec functionality. close exactly this formspec.

@@ -521,9 +521,9 @@ end)
 

 function advtrains.register_wagon(sysname, traintype, prototype, desc, inv_img)

 	setmetatable(prototype, {__index=wagon})

-	minetest.register_entity("advtrains:"..sysname,prototype)

+	minetest.register_entity(":advtrains:"..sysname,prototype)

 	

-	minetest.register_craftitem("advtrains:"..sysname, {

+	minetest.register_craftitem(":advtrains:"..sysname, {

 		description = desc,

 		inventory_image = inv_img,

 		wield_image = inv_img,

@@ -577,194 +577,11 @@ advtrains.register_wagon("yellowwagon", "steam",{textures = {"yellow.png"}})
 	wagons can define update_animation(self, velocity) if they have a speed-dependent animation

 	this function will be called when the velocity vector changes or every 2 seconds.

 ]]

-advtrains.register_wagon("newlocomotive", "steam",{

-	mesh="advtrains_engine_steam.b3d",

-	textures = {"advtrains_newlocomotive.png"},

-	is_locomotive=true,

-	seats = {

-		{

-			name="Driver Stand (left)",

-			attach_offset={x=-5, y=10, z=-10},

-			view_offset={x=0, y=6, z=0},

-			driving_ctrl_access=true,

-		},

-		{

-			name="Driver Stand (right)",

-			attach_offset={x=5, y=10, z=-10},

-			view_offset={x=0, y=6, z=0},

-			driving_ctrl_access=true,

-		},

-	},

-	visual_size = {x=1, y=1},

-	wagon_span=1.85,

-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},

-	update_animation=function(self, velocity)

-		--if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then

-			self.object:set_animation({x=1,y=60}, 100)--math.floor(velocity))

-			--self.old_anim_velocity=advtrains.abs_ceil(velocity)

-		--end

-	end,

-	custom_on_activate = function(self, staticdata_table, dtime_s)

-		minetest.add_particlespawner({

-			amount = 10,

-			time = 0,

-		--  ^ If time is 0 has infinite lifespan and spawns the amount on a per-second base

-			minpos = {x=0, y=2, z=1.2},

-			maxpos = {x=0, y=2, z=1.2},

-			minvel = {x=-0.2, y=1.8, z=-0.2},

-			maxvel = {x=0.2, y=2, z=0.2},

-			minacc = {x=0, y=-0.1, z=0},

-			maxacc = {x=0, y=-0.3, z=0},

-			minexptime = 2,

-			maxexptime = 4,

-			minsize = 1,

-			maxsize = 5,

-		--  ^ The particle's properties are random values in between the bounds:

-		--  ^ minpos/maxpos, minvel/maxvel (velocity), minacc/maxacc (acceleration),

-		--  ^ minsize/maxsize, minexptime/maxexptime (expirationtime)

-			collisiondetection = true,

-		--  ^ collisiondetection: if true uses collision detection

-			vertical = false,

-		--  ^ vertical: if true faces player using y axis only

-			texture = "smoke_puff.png",

-		--  ^ Uses texture (string)

-			attached = self.object,

-		})

-	end,

-	drops={"default:steelblock 4"},

-}, "Steam Engine", "advtrains_newlocomotive_inv.png")

-advtrains.register_wagon("wagon_default", "steam",{

-	mesh="advtrains_wagon.b3d",

-	textures = {"advtrains_wagon.png"},

-	seats = {

-		{

-			name="Default Seat",

-			attach_offset={x=0, y=10, z=0},

-			view_offset={x=0, y=6, z=0},

-		},

-	},

-	visual_size = {x=1, y=1},

-	wagon_span=1.8,

-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},

-	drops={"default:steelblock 4"},

-}, "Passenger Wagon", "advtrains_wagon_inv.png")

-advtrains.register_wagon("wagon_box", "steam",{

-	mesh="advtrains_wagon.b3d",

-	textures = {"advtrains_wagon_box.png"},

-	seats = {},

-	visual_size = {x=1, y=1},

-	wagon_span=1.8,

-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},

-	drops={"default:steelblock 4"},

-	has_inventory = true,

-	get_inventory_formspec = function(self)

-		return "size[8,11]"..

-			"list[detached:advtrains_wgn_"..self.unique_id..";box;0,0;8,6;]"..

-			"list[current_player;main;0,7;8,4;]"..

-			"listring[]"

-	end,

-	inventory_list_sizes = {

-		box=8*6,

-	},

-}, "Box Wagon", "advtrains_wagon_box_inv.png")

 

-advtrains.register_train_type("electric", {"regular", "default"}, 20)

 

-advtrains.register_wagon("engine_japan", "electric",{

-	mesh="advtrains_engine_japan.b3d",

-	textures = {"advtrains_engine_japan.png"},

-	seats = {

-		{

-			name="Default Seat (driver stand)",

-			attach_offset={x=0, y=10, z=0},

-			view_offset={x=0, y=6, z=0},

-			driving_ctrl_access=true,

-		},

-	},

-	visual_size = {x=1, y=1},

-	wagon_span=2.5,

-	is_locomotive=true,

-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},

-	drops={"default:steelblock 4"},

-}, "Japanese Train Engine", "advtrains_engine_japan_inv.png")

+advtrains.register_train_type("electric", {"regular", "default"}, 20)

 

-advtrains.register_wagon("wagon_japan", "electric",{

-	mesh="advtrains_wagon_japan.b3d",

-	textures = {"advtrains_wagon_japan.png"},

-	seats = {

-		{

-			name="Default Seat",

-			attach_offset={x=0, y=10, z=0},

-			view_offset={x=0, y=6, z=0},

-		},

-	},

-	visual_size = {x=1, y=1},

-	wagon_span=2.3,

-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},

-	drops={"default:steelblock 4"},

-}, "Japanese Train Wagon", "advtrains_wagon_japan_inv.png")

 

-advtrains.register_wagon("engine_industrial", "electric",{

-	mesh="advtrains_engine_industrial.b3d",

-	textures = {"advtrains_engine_industrial.png"},

-	seats = {

-		{

-			name="Driver Stand (left)",

-			attach_offset={x=-5, y=10, z=-10},

-			view_offset={x=0, y=10, z=0},

-			driving_ctrl_access=true,

-		},

-		{

-			name="Driver Stand (right)",

-			attach_offset={x=5, y=10, z=-10},

-			view_offset={x=0, y=10, z=0},

-			driving_ctrl_access=true,

-		},

-	},

-	visual_size = {x=1, y=1},

-	wagon_span=2.6,

-	is_locomotive=true,

-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},

-	drops={"default:steelblock 4"},

-}, "Industrial Train Engine", "advtrains_engine_industrial_inv.png")

-advtrains.register_wagon("wagon_tank", "electric",{

-	mesh="advtrains_wagon_tank.b3d",

-	textures = {"advtrains_wagon_tank.png"},

-	seats = {},

-	visual_size = {x=1, y=1},

-	wagon_span=2.2,

-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},

-	drops={"default:steelblock 4"},

-	has_inventory = true,

-	get_inventory_formspec = function(self)

-		return "size[8,11]"..

-			"list[detached:advtrains_wgn_"..self.unique_id..";box;0,0;8,6;]"..

-			"list[current_player;main;0,7;8,4;]"..

-			"listring[]"

-	end,

-	inventory_list_sizes = {

-		box=8*6,

-	},

-}, "Industrial tank wagon", "advtrains_wagon_tank_inv.png")

-advtrains.register_wagon("wagon_wood", "electric",{

-	mesh="advtrains_wagon_wood.b3d",

-	textures = {"advtrains_wagon_wood.png"},

-	seats = {},

-	visual_size = {x=1, y=1},

-	wagon_span=1.8,

-	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},

-	drops={"default:steelblock 4"},

-	has_inventory = true,

-	get_inventory_formspec = function(self)

-		return "size[8,11]"..

-			"list[detached:advtrains_wgn_"..self.unique_id..";box;0,0;8,6;]"..

-			"list[current_player;main;0,7;8,4;]"..

-			"listring[]"

-	end,

-	inventory_list_sizes = {

-		box=8*6,

-	},

-}, "Industrial wood wagon", "advtrains_wagon_wood_inv.png")

 

 advtrains.register_train_type("subway", {"default"}, 15)

 

diff --git a/advtrains_train_industrial/depends.txt b/advtrains_train_industrial/depends.txt
new file mode 100644
index 0000000..6f00bf6
--- /dev/null
+++ b/advtrains_train_industrial/depends.txt
@@ -0,0 +1 @@
+advtrains
\ No newline at end of file
diff --git a/advtrains_train_industrial/init.lua b/advtrains_train_industrial/init.lua
new file mode 100644
index 0000000..93c75af
--- /dev/null
+++ b/advtrains_train_industrial/init.lua
@@ -0,0 +1,61 @@
+advtrains.register_wagon("engine_industrial", "electric",{
+	mesh="advtrains_engine_industrial.b3d",
+	textures = {"advtrains_engine_industrial.png"},
+	seats = {
+		{
+			name="Driver Stand (left)",
+			attach_offset={x=-5, y=10, z=-10},
+			view_offset={x=0, y=10, z=0},
+			driving_ctrl_access=true,
+		},
+		{
+			name="Driver Stand (right)",
+			attach_offset={x=5, y=10, z=-10},
+			view_offset={x=0, y=10, z=0},
+			driving_ctrl_access=true,
+		},
+	},
+	visual_size = {x=1, y=1},
+	wagon_span=2.6,
+	is_locomotive=true,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+}, "Industrial Train Engine", "advtrains_engine_industrial_inv.png")
+advtrains.register_wagon("wagon_tank", "electric",{
+	mesh="advtrains_wagon_tank.b3d",
+	textures = {"advtrains_wagon_tank.png"},
+	seats = {},
+	visual_size = {x=1, y=1},
+	wagon_span=2.2,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+	has_inventory = true,
+	get_inventory_formspec = function(self)
+		return "size[8,11]"..
+			"list[detached:advtrains_wgn_"..self.unique_id..";box;0,0;8,6;]"..
+			"list[current_player;main;0,7;8,4;]"..
+			"listring[]"
+	end,
+	inventory_list_sizes = {
+		box=8*6,
+	},
+}, "Industrial tank wagon", "advtrains_wagon_tank_inv.png")
+advtrains.register_wagon("wagon_wood", "electric",{
+	mesh="advtrains_wagon_wood.b3d",
+	textures = {"advtrains_wagon_wood.png"},
+	seats = {},
+	visual_size = {x=1, y=1},
+	wagon_span=1.8,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+	has_inventory = true,
+	get_inventory_formspec = function(self)
+		return "size[8,11]"..
+			"list[detached:advtrains_wgn_"..self.unique_id..";box;0,0;8,6;]"..
+			"list[current_player;main;0,7;8,4;]"..
+			"listring[]"
+	end,
+	inventory_list_sizes = {
+		box=8*6,
+	},
+}, "Industrial wood wagon", "advtrains_wagon_wood_inv.png")
diff --git a/models/advtrains_engine_industrial.b3d b/advtrains_train_industrial/models/advtrains_engine_industrial.b3d
index f1ea485..f1ea485 100644
--- a/models/advtrains_engine_industrial.b3d
+++ b/advtrains_train_industrial/models/advtrains_engine_industrial.b3d
diff --git a/models/advtrains_wagon_tank.b3d b/advtrains_train_industrial/models/advtrains_wagon_tank.b3d
index af2604b..af2604b 100644
--- a/models/advtrains_wagon_tank.b3d
+++ b/advtrains_train_industrial/models/advtrains_wagon_tank.b3d
diff --git a/models/advtrains_wagon_wood.b3d b/advtrains_train_industrial/models/advtrains_wagon_wood.b3d
index 0e7fb4b..0e7fb4b 100644
--- a/models/advtrains_wagon_wood.b3d
+++ b/advtrains_train_industrial/models/advtrains_wagon_wood.b3d
diff --git a/textures/advtrains_engine_industrial.png b/advtrains_train_industrial/textures/advtrains_engine_industrial.png
index 38a872f..38a872f 100644
--- a/textures/advtrains_engine_industrial.png
+++ b/advtrains_train_industrial/textures/advtrains_engine_industrial.png
diff --git a/textures/advtrains_engine_industrial_inv.png b/advtrains_train_industrial/textures/advtrains_engine_industrial_inv.png
index be4e80f..be4e80f 100644
--- a/textures/advtrains_engine_industrial_inv.png
+++ b/advtrains_train_industrial/textures/advtrains_engine_industrial_inv.png
diff --git a/textures/advtrains_wagon_tank.png b/advtrains_train_industrial/textures/advtrains_wagon_tank.png
index 79b1316..79b1316 100644
--- a/textures/advtrains_wagon_tank.png
+++ b/advtrains_train_industrial/textures/advtrains_wagon_tank.png
diff --git a/textures/advtrains_wagon_tank_inv.png b/advtrains_train_industrial/textures/advtrains_wagon_tank_inv.png
index 03401be..03401be 100644
--- a/textures/advtrains_wagon_tank_inv.png
+++ b/advtrains_train_industrial/textures/advtrains_wagon_tank_inv.png
diff --git a/textures/advtrains_wagon_wood.png b/advtrains_train_industrial/textures/advtrains_wagon_wood.png
index acc6f72..acc6f72 100644
--- a/textures/advtrains_wagon_wood.png
+++ b/advtrains_train_industrial/textures/advtrains_wagon_wood.png
diff --git a/textures/advtrains_wagon_wood_inv.png b/advtrains_train_industrial/textures/advtrains_wagon_wood_inv.png
index 87109dd..87109dd 100644
--- a/textures/advtrains_wagon_wood_inv.png
+++ b/advtrains_train_industrial/textures/advtrains_wagon_wood_inv.png
diff --git a/advtrains_train_japan/depends.txt b/advtrains_train_japan/depends.txt
new file mode 100644
index 0000000..6f00bf6
--- /dev/null
+++ b/advtrains_train_japan/depends.txt
@@ -0,0 +1 @@
+advtrains
\ No newline at end of file
diff --git a/advtrains_train_japan/init.lua b/advtrains_train_japan/init.lua
new file mode 100644
index 0000000..7cef69c
--- /dev/null
+++ b/advtrains_train_japan/init.lua
@@ -0,0 +1,34 @@
+advtrains.register_wagon("engine_japan", "electric",{
+	mesh="advtrains_engine_japan.b3d",
+	textures = {"advtrains_engine_japan.png"},
+	seats = {
+		{
+			name="Default Seat (driver stand)",
+			attach_offset={x=0, y=10, z=0},
+			view_offset={x=0, y=6, z=0},
+			driving_ctrl_access=true,
+		},
+	},
+	visual_size = {x=1, y=1},
+	wagon_span=2.5,
+	is_locomotive=true,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+}, "Japanese Train Engine", "advtrains_engine_japan_inv.png")
+
+advtrains.register_wagon("wagon_japan", "electric",{
+	mesh="advtrains_wagon_japan.b3d",
+	textures = {"advtrains_wagon_japan.png"},
+	seats = {
+		{
+			name="Default Seat",
+			attach_offset={x=0, y=10, z=0},
+			view_offset={x=0, y=6, z=0},
+		},
+	},
+	visual_size = {x=1, y=1},
+	wagon_span=2.3,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+}, "Japanese Train Wagon", "advtrains_wagon_japan_inv.png")
+
diff --git a/models/advtrains_engine_japan.b3d b/advtrains_train_japan/models/advtrains_engine_japan.b3d
index f82c33e..f82c33e 100644
--- a/models/advtrains_engine_japan.b3d
+++ b/advtrains_train_japan/models/advtrains_engine_japan.b3d
diff --git a/models/advtrains_wagon_japan.b3d b/advtrains_train_japan/models/advtrains_wagon_japan.b3d
index 7970438..7970438 100644
--- a/models/advtrains_wagon_japan.b3d
+++ b/advtrains_train_japan/models/advtrains_wagon_japan.b3d
diff --git a/textures/advtrains_engine_japan.png b/advtrains_train_japan/textures/advtrains_engine_japan.png
index b286b38..b286b38 100644
--- a/textures/advtrains_engine_japan.png
+++ b/advtrains_train_japan/textures/advtrains_engine_japan.png
diff --git a/textures/advtrains_engine_japan_inv.png b/advtrains_train_japan/textures/advtrains_engine_japan_inv.png
index 6af0636..6af0636 100644
--- a/textures/advtrains_engine_japan_inv.png
+++ b/advtrains_train_japan/textures/advtrains_engine_japan_inv.png
diff --git a/textures/advtrains_wagon_japan.png b/advtrains_train_japan/textures/advtrains_wagon_japan.png
index bee565e..bee565e 100644
--- a/textures/advtrains_wagon_japan.png
+++ b/advtrains_train_japan/textures/advtrains_wagon_japan.png
diff --git a/textures/advtrains_wagon_japan_inv.png b/advtrains_train_japan/textures/advtrains_wagon_japan_inv.png
index 3e6357c..3e6357c 100644
--- a/textures/advtrains_wagon_japan_inv.png
+++ b/advtrains_train_japan/textures/advtrains_wagon_japan_inv.png
diff --git a/advtrains_train_steam/depends.txt b/advtrains_train_steam/depends.txt
new file mode 100644
index 0000000..6f00bf6
--- /dev/null
+++ b/advtrains_train_steam/depends.txt
@@ -0,0 +1 @@
+advtrains
\ No newline at end of file
diff --git a/advtrains_train_steam/init.lua b/advtrains_train_steam/init.lua
new file mode 100644
index 0000000..7b66a51
--- /dev/null
+++ b/advtrains_train_steam/init.lua
@@ -0,0 +1,115 @@
+advtrains.register_wagon("newlocomotive", "steam",{
+	mesh="advtrains_engine_steam.b3d",
+	textures = {"advtrains_newlocomotive.png"},
+	is_locomotive=true,
+	seats = {
+		{
+			name="Driver Stand (left)",
+			attach_offset={x=-5, y=10, z=-10},
+			view_offset={x=0, y=6, z=0},
+			driving_ctrl_access=true,
+		},
+		{
+			name="Driver Stand (right)",
+			attach_offset={x=5, y=10, z=-10},
+			view_offset={x=0, y=6, z=0},
+			driving_ctrl_access=true,
+		},
+	},
+	visual_size = {x=1, y=1},
+	wagon_span=1.85,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	update_animation=function(self, velocity)
+		--if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then
+			self.object:set_animation({x=1,y=60}, 100)--math.floor(velocity))
+			--self.old_anim_velocity=advtrains.abs_ceil(velocity)
+		--end
+	end,
+	custom_on_activate = function(self, staticdata_table, dtime_s)
+		minetest.add_particlespawner({
+			amount = 10,
+			time = 0,
+		--  ^ If time is 0 has infinite lifespan and spawns the amount on a per-second base
+			minpos = {x=0, y=2, z=1.2},
+			maxpos = {x=0, y=2, z=1.2},
+			minvel = {x=-0.2, y=1.8, z=-0.2},
+			maxvel = {x=0.2, y=2, z=0.2},
+			minacc = {x=0, y=-0.1, z=0},
+			maxacc = {x=0, y=-0.3, z=0},
+			minexptime = 2,
+			maxexptime = 4,
+			minsize = 1,
+			maxsize = 5,
+		--  ^ The particle's properties are random values in between the bounds:
+		--  ^ minpos/maxpos, minvel/maxvel (velocity), minacc/maxacc (acceleration),
+		--  ^ minsize/maxsize, minexptime/maxexptime (expirationtime)
+			collisiondetection = true,
+		--  ^ collisiondetection: if true uses collision detection
+			vertical = false,
+		--  ^ vertical: if true faces player using y axis only
+			texture = "smoke_puff.png",
+		--  ^ Uses texture (string)
+			attached = self.object,
+		})
+	end,
+	drops={"default:steelblock 4"},
+}, "Steam Engine", "advtrains_newlocomotive_inv.png")
+advtrains.register_wagon("wagon_default", "steam",{
+	mesh="advtrains_wagon.b3d",
+	textures = {"advtrains_wagon.png"},
+	seats = {
+		{
+			name="Default Seat",
+			attach_offset={x=0, y=10, z=0},
+			view_offset={x=0, y=6, z=0},
+		},
+	},
+	visual_size = {x=1, y=1},
+	wagon_span=1.8,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+}, "Passenger Wagon", "advtrains_wagon_inv.png")
+advtrains.register_wagon("wagon_box", "steam",{
+	mesh="advtrains_wagon.b3d",
+	textures = {"advtrains_wagon_box.png"},
+	seats = {},
+	visual_size = {x=1, y=1},
+	wagon_span=1.8,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	drops={"default:steelblock 4"},
+	has_inventory = true,
+	get_inventory_formspec = function(self)
+		return "size[8,11]"..
+			"list[detached:advtrains_wgn_"..self.unique_id..";box;0,0;8,6;]"..
+			"list[current_player;main;0,7;8,4;]"..
+			"listring[]"
+	end,
+	inventory_list_sizes = {
+		box=8*6,
+	},
+}, "Box Wagon", "advtrains_wagon_box_inv.png")
+
+minetest.register_craft({
+	output = 'advtrains:newlocomotive',
+	recipe = {
+		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+		{'default:steelblock', 'dye:black', 'default:steelblock'},
+		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+	},
+})
+minetest.register_craft({
+	output = 'advtrains:wagon_default',
+	recipe = {
+		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+		{'default:steelblock', 'dye:dark_green', 'default:steelblock'},
+		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+	},
+})
+minetest.register_craft({
+	output = 'advtrains:wagon_box',
+	recipe = {
+		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+		{'default:steelblock', 'default:chest', 'default:steelblock'},
+		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+	},
+})
diff --git a/models/advtrains_engine_steam.b3d b/advtrains_train_steam/models/advtrains_engine_steam.b3d
index 36bdd15..36bdd15 100644
--- a/models/advtrains_engine_steam.b3d
+++ b/advtrains_train_steam/models/advtrains_engine_steam.b3d
diff --git a/models/advtrains_wagon.b3d b/advtrains_train_steam/models/advtrains_wagon.b3d
index 5c8214c..5c8214c 100644
--- a/models/advtrains_wagon.b3d
+++ b/advtrains_train_steam/models/advtrains_wagon.b3d
diff --git a/textures/advtrains_newlocomotive.png b/advtrains_train_steam/textures/advtrains_newlocomotive.png
index e461bc7..e461bc7 100644
--- a/textures/advtrains_newlocomotive.png
+++ b/advtrains_train_steam/textures/advtrains_newlocomotive.png
diff --git a/textures/advtrains_newlocomotive_inv.png b/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png
index 8d3fafb..8d3fafb 100755..100644
--- a/textures/advtrains_newlocomotive_inv.png
+++ b/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png
diff --git a/textures/advtrains_wagon.png b/advtrains_train_steam/textures/advtrains_wagon.png
index c37c979..c37c979 100644
--- a/textures/advtrains_wagon.png
+++ b/advtrains_train_steam/textures/advtrains_wagon.png
diff --git a/textures/advtrains_wagon_box.png b/advtrains_train_steam/textures/advtrains_wagon_box.png
index 8bfbe06..8bfbe06 100644
--- a/textures/advtrains_wagon_box.png
+++ b/advtrains_train_steam/textures/advtrains_wagon_box.png
diff --git a/textures/advtrains_wagon_box_inv.png b/advtrains_train_steam/textures/advtrains_wagon_box_inv.png
index 480f245..480f245 100644
--- a/textures/advtrains_wagon_box_inv.png
+++ b/advtrains_train_steam/textures/advtrains_wagon_box_inv.png
diff --git a/textures/advtrains_wagon_inv.png b/advtrains_train_steam/textures/advtrains_wagon_inv.png
index 0b72ac3..0b72ac3 100755..100644
--- a/textures/advtrains_wagon_inv.png
+++ b/advtrains_train_steam/textures/advtrains_wagon_inv.png
diff --git a/advtrains_train_subway/depends.txt b/advtrains_train_subway/depends.txt
new file mode 100644
index 0000000..6f00bf6
--- /dev/null
+++ b/advtrains_train_subway/depends.txt
@@ -0,0 +1 @@
+advtrains
\ No newline at end of file
diff --git a/advtrains_train_subway/init.lua b/advtrains_train_subway/init.lua
new file mode 100644
index 0000000..c933fff
--- /dev/null
+++ b/advtrains_train_subway/init.lua
@@ -0,0 +1,28 @@
+
+advtrains.register_wagon("subway_wagon", "subway",{
+	mesh="advtrains_subway_train.b3d",
+	textures = {"advtrains_subway_train.png"},
+	seats = {
+		{
+			name="Default Seat (driver stand)",
+			attach_offset={x=0, y=10, z=0},
+			view_offset={x=0, y=6, z=0},
+			driving_ctrl_access=true,
+		},
+	},
+	visual_size = {x=1, y=1},
+	wagon_span=1.8,
+	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
+	is_locomotive=true,
+	drops={"default:steelblock 4"},
+}, "Subway Passenger Wagon", "advtrains_subway_train_inv.png")
+
+--wagons
+minetest.register_craft({
+	output = 'advtrains:subway_wagon',
+	recipe = {
+		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+		{'default:steelblock', 'dye:yellow', 'default:steelblock'},
+		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+	},
+})
diff --git a/models/advtrains_subway_train.b3d b/advtrains_train_subway/models/advtrains_subway_train.b3d
index a824d33..a824d33 100644
--- a/models/advtrains_subway_train.b3d
+++ b/advtrains_train_subway/models/advtrains_subway_train.b3d
diff --git a/textures/advtrains_subway_train.png b/advtrains_train_subway/textures/advtrains_subway_train.png
index 1d569f3..1d569f3 100644
--- a/textures/advtrains_subway_train.png
+++ b/advtrains_train_subway/textures/advtrains_subway_train.png
diff --git a/textures/advtrains_subway_train_inv.png b/advtrains_train_subway/textures/advtrains_subway_train_inv.png
index 1d0e809..1d0e809 100644
--- a/textures/advtrains_subway_train_inv.png
+++ b/advtrains_train_subway/textures/advtrains_subway_train_inv.png
diff --git a/modpack.txt b/modpack.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/modpack.txt