diff options
author | botn365 <42187820+botn365@users.noreply.github.com> | 2019-12-08 12:54:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-08 12:54:21 +0100 |
commit | 584ebeaa18fba9de4922b09def9f7cf1b5d31eae (patch) | |
tree | f74277077620b21df5dae75083975be3ca11dc8a /src/resources | |
parent | 9ba6d563d1b69bc8aa88d48754c273dae77aa713 (diff) | |
parent | e49fbd1330c0875ff531ff25119afe15b54c9448 (diff) | |
download | GT5-Unofficial-584ebeaa18fba9de4922b09def9f7cf1b5d31eae.tar.gz GT5-Unofficial-584ebeaa18fba9de4922b09def9f7cf1b5d31eae.tar.bz2 GT5-Unofficial-584ebeaa18fba9de4922b09def9f7cf1b5d31eae.zip |
Merge pull request #1 from alkcorp/DevTop
Dev top
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/assets/gregtech/lang/en_US.lang | 4 | ||||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_0.png) | bin | 1448 -> 1448 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_1.png) | bin | 1444 -> 1444 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_2.png) | bin | 1446 -> 1446 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_3.png) | bin | 1446 -> 1446 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_4.png) | bin | 1443 -> 1443 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_0.png) | bin | 1405 -> 1405 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_1.png) | bin | 1403 -> 1403 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_2.png) | bin | 1403 -> 1403 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_3.png) | bin | 1402 -> 1402 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_4.png) | bin | 1400 -> 1400 bytes |
11 files changed, 3 insertions, 1 deletions
diff --git a/src/resources/assets/gregtech/lang/en_US.lang b/src/resources/assets/gregtech/lang/en_US.lang index 9989bffcf0..e2120fdf7b 100644 --- a/src/resources/assets/gregtech/lang/en_US.lang +++ b/src/resources/assets/gregtech/lang/en_US.lang @@ -212,7 +212,9 @@ achievement.decay.technetium99.desc=Cyclotron Product - +//24/11/19 +achievement.gt.blockmachines.hatch.turbine.input.tier.00=Turbine Housing +achievement.gt.blockmachines.hatch.turbine.input.tier.00.desc=[AL] Pickup this item to see the recipe in NEI diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_0.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png Binary files differindex cbf604f2b3..cbf604f2b3 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_0.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png Binary files differindex 3b7ac3d50e..3b7ac3d50e 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_1.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_2.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png Binary files differindex a5a5e2c559..a5a5e2c559 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_2.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_3.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png Binary files differindex b68c900ddd..b68c900ddd 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_3.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_4.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png Binary files differindex df182aeaa5..df182aeaa5 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Side_4.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_0.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png Binary files differindex 85bc3f16cd..85bc3f16cd 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_0.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png Binary files differindex f82185ebdb..f82185ebdb 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_1.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_2.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png Binary files differindex 345476e03c..345476e03c 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_2.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_3.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png Binary files differindex 971164eb3e..971164eb3e 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_3.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_4.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png Binary files differindex 5b5bac3ad2..5b5bac3ad2 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/RoundRobinator_Top_4.png +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png |