diff options
| author | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-15 16:04:02 +0100 |
|---|---|---|
| committer | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-15 16:04:02 +0100 |
| commit | ff4b8c7068c2ea7d654e9beda00646d23e62b314 (patch) | |
| tree | 2c84162154ba681232f86dffd4106db530236814 /src/main/resources/assets | |
| parent | 10182ddb54b6df57118cfe0715a037edf0fee14b (diff) | |
| parent | 47ce336f288a45aa3244c8ae1177499fa5080942 (diff) | |
| download | GT5-Unofficial-ff4b8c7068c2ea7d654e9beda00646d23e62b314.tar.gz GT5-Unofficial-ff4b8c7068c2ea7d654e9beda00646d23e62b314.tar.bz2 GT5-Unofficial-ff4b8c7068c2ea7d654e9beda00646d23e62b314.zip | |
Merge tag '1.7.21' into unified-build-script2
# Conflicts:
# build.properties
Diffstat (limited to 'src/main/resources/assets')
| -rw-r--r-- | src/main/resources/assets/miscutils/lang/en_US.lang | 1 | ||||
| -rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png | bin | 671 -> 677 bytes | |||
| -rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png | bin | 598 -> 656 bytes |
3 files changed, 1 insertions, 0 deletions
diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index c70d102235..7a021cbc26 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -3235,6 +3235,7 @@ tile.Botmium Frame Box.name=Botmium Frame Box item.itemBasicTurbine.name=Basic Turbine item.itemBasicTurbine_0.name=Basic Iron Turbine item.itemBasicTurbine_1.name=Basic Bronze Turbine +item.itemBasicTurbine_2.name=Basic Steel Turbine interaction.voidexcess.enabled=Void Excess Enabled interaction.voidexcess.disabled=Void Excess Disabled diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png Binary files differindex d8677eda87..b807fc0465 100644 --- a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png Binary files differindex c0065f8379..1b942edfc9 100644 --- a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png |
