Skip to content

Commit

Permalink
Merge branch 'TheDoctor1138' into TC4.5-1.7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
EternalBlueFlame committed May 22, 2024
2 parents 132f569 + 427bf19 commit 16a7016
Show file tree
Hide file tree
Showing 17 changed files with 1,012 additions and 624 deletions.
1,634 changes: 1,011 additions & 623 deletions src/main/java/train/client/render/models/ModelHopper_UK.java

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/java/train/common/library/EnumTrains.java
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ public static TrainRecord[] trains() {
TrainRecord.makeEntry("MetalTramCoach", "MetalTramCoach", EntityPassengerMetalTramCoach.class, ItemIDs.minecartMetalTramCoach.item, "passenger", 0, 0, 2, 0, 0, 0, 0, 0, 0, new String[]{"Green", "Brown", "Yellow"}, 0, 0, "Modeller: Lord Squid"),
TrainRecord.makeEntry("RW_Type_3", "RWType3", EntityLocoSteamRWType3.class, ItemIDs.minecartRWType3.item, "steam", 900, 101, 0, 10, 10, 100, 0.7, 0.7, 4000, new String[]{"Black", "Blue", "Green", "Lime", "Pink", "Red"}, 18, -2.6f, "Pack: B.I.P."),
TrainRecord.makeEntry("RW_Type_2", "RWType2", EntityLocoSteamRWType2.class, ItemIDs.minecartRWType2.item, "steam", 775, 81, 0, 10, 10, 100, 0.7, 0.7, 8000, new String[]{"Black", "Brown", "Green", "Grey", "LightGrey", "Red", "Purple", "Pink"}, 18, -2.4f, "Pack: B.I.P."),
TrainRecord.makeEntry("HopperUK", "HopperUK", EntityFreightHopperUK.class, ItemIDs.minecartHopper_UK.item, "freight", 1.5, new String[]{"Grey", "Yellow"}, 18, 36, "Pack: B.I.P."),
TrainRecord.makeEntry("HopperUK", "HopperUK", EntityFreightHopperUK.class, ItemIDs.minecartHopper_UK.item, "freight", 1.5, new String[]{"Black", "Blue", "Brown", "Green", "Grey", "LightBlue", "LightGrey", "Lime", "Magenta", "Orange", "Pink", "Purple", "Red", "White", "Yellow"}, 18, 36, "Pack: B.I.P."),
TrainRecord.makeEntry("GWR_42xx", "GWR42xx", EntityLocoSteamGWR42xx.class, ItemIDs.minecartGWR42xx.item, "steam", 1300, 105, 0, 10, 10, 100, 0.7, 0.7, 8200, new String[]{"Black", "Blue", "Green", "Lime"}, 18, -4.3f, "Pack: B.I.P."),
TrainRecord.makeEntry("GWR_72xx", "GWR72xx", EntityLocoSteamGWR72xx.class, ItemIDs.minecartGWR72xx.item, "steam", 1375, 105, 0, 10, 10, 100, 0.7, 0.7, 9000, new String[]{"Black", "Blue", "Green", "Lime"}, 18, -5.0f, "Pack: B.I.P."),
TrainRecord.makeEntry("GWR_101_Class", "GWR101Class", EntityLocoSteamGWR101Class.class, ItemIDs.minecartGWR101Class.item, "steam", 550, 51, 0, 10, 10, 100, 0.7, 0.7, 9500, new String[]{"Blue", "Brown", "Green", "Grey", "Lime", "Purple", "Red", "Black", "Magenta", "Grey", "LightGrey", "White"}, 18, -2.4f, "Pack: B.I.P."),
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 16a7016

Please sign in to comment.