Merge remote-tracking branch 'TheDoctor1138/1.7-Community-4.3' into 1…

….7-Community-4.3
EternalBlueFlame · Dec 20, 2023 · 45077da · 45077da
2 parents 95a4cfc + e98b495
commit 45077da
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 58 deletions.
diff --git a/src/main/java/train/client/render/RenderEnum.java b/src/main/java/train/client/render/RenderEnum.java
@@ -1399,9 +1399,9 @@ public enum RenderEnum implements TrainRenderRecord {
     M8CTail(EntityPassengerM8CTail.class, new ModelM8CTail(), "M8C_", true, new float[]{-1F, 0.2F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
     Class416Loco(EntityElectricClass416Loco.class, new ModelClass416Engine(), "Class_205_", true, new float[]{-2F, 0.15F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
     Class416Tail(EntityPassengerClass416Tail.class, new ModelClass416Tail(), "Class_205_", true, new float[]{0f, 0.15f, 0f}, new float[]{0F, 0F, 180F}, null, "", 0, null, "", null, 0, false),
-    DB420Loco(EntityElectricDB420Loco.class, new ModelDB420End(), "db420_", true, new float[]{-1.5F, 0.16F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
-    DB420Middle(EntityPassengerDB420Middle.class, new ModelDB420Middle(), "db420_", true, new float[]{0F, 0.16F, 0F}, new float[]{0F, 0F, 180F}, null, "", 0, null, "", null, 0, false),
-    DB420Tail(EntityPassengerDB420Tail.class, new ModelDB420End(), "db420_", true, new float[]{-1.5F, 0.16F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
+    DB420Loco(EntityElectricDB420Loco.class, new ModelDB420End(), "db420_", true, new float[]{-1.5F, 0.18F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
+    DB420Middle(EntityPassengerDB420Middle.class, new ModelDB420Middle(), "db420_", true, new float[]{0F, 0.18F, 0F}, new float[]{0F, 0F, 180F}, null, "", 0, null, "", null, 0, false),
+    DB420Tail(EntityPassengerDB420Tail.class, new ModelDB420End(), "db420_", true, new float[]{-1.5F, 0.18F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
     CattleVan(EntityCattleVan.class, new ModelCattleVan(), "cattle_van", false, new float[]{0F, 0.15F, 0.0F}, new float[]{0F, 0F, 180F}, null, "", 0, null, "", null, 0, false),
     Class401Loco(EntityLocoElectricClass401.class, new ModelClass401Engine(), "2-bil_", true, new float[]{-1.7F, 0.17F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
     Class401Tail(EntityPassengerClass401Tail.class, new ModelClass401tail(), "2-bil_", true, new float[]{0.02F, 0.17F, 0.03F}, new float[]{0F, 0F, 180F}, null, "", 0, null, "", null, 0, false),

diff --git a/src/main/java/train/client/render/models/ModelDuewagGT6ERLoco.java b/src/main/java/train/client/render/models/ModelDuewagGT6ERLoco.java
diff --git a/src/main/resources/assets/tc/textures/trains/Duewag_GT6ER_Grey.png b/src/main/resources/assets/tc/textures/trains/Duewag_GT6ER_Grey.png
diff --git a/src/main/resources/assets/tc/textures/trains/Duewag_GT6ER_LightBlue.png b/src/main/resources/assets/tc/textures/trains/Duewag_GT6ER_LightBlue.png
diff --git a/src/main/resources/assets/tc/textures/trains/Duewag_GT6ER_Red.png b/src/main/resources/assets/tc/textures/trains/Duewag_GT6ER_Red.png
diff --git a/src/main/resources/assets/tc/textures/trains/db420_Red.png b/src/main/resources/assets/tc/textures/trains/db420_Red.png
diff --git a/src/main/resources/assets/tc/textures/trains/db420_Yellow.png b/src/main/resources/assets/tc/textures/trains/db420_Yellow.png