aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDreamMasterXXL <dream-master@gmx.net>2020-11-21 12:58:39 +0100
committerDreamMasterXXL <dream-master@gmx.net>2020-11-21 12:58:39 +0100
commit0f2d417148350ff7952cdf7ac86b45c7392199ac (patch)
tree09d4cad8395a777d9e6b7c07cdd1eec40fbfe3ac
parentf79c50736de65bc1affea7542dd1815ed5647c2d (diff)
parent248eceff829e1101037c245734520b2ebaa254b7 (diff)
downloadGT5-Unofficial-0f2d417148350ff7952cdf7ac86b45c7392199ac.tar.gz
GT5-Unofficial-0f2d417148350ff7952cdf7ac86b45c7392199ac.tar.bz2
GT5-Unofficial-0f2d417148350ff7952cdf7ac86b45c7392199ac.zip
Merge branch 'Dev-Build-Test' into experimental
-rw-r--r--build.properties2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.pngbin610 -> 3463 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_ENGINE_INTAKE.pngbin585 -> 3418 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANIUM.pngbin684 -> 3324 bytes
4 files changed, 1 insertions, 1 deletions
diff --git a/build.properties b/build.properties
index 85d8779c47..aa8d853ec8 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
minecraft.version=1.7.10
forge.version=10.13.4.1614-1.7.10
-gt.version=5.09.33.56
+gt.version=5.09.33.57
ae2.version=rv3-beta-22
applecore.version=1.7.10-1.2.1+107.59407
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
index bb2f520e30..ad24535fe7 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ENGINE_INTAKE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_ENGINE_INTAKE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_ENGINE_INTAKE.png
index b9f96fbceb..2e72f13642 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_ENGINE_INTAKE.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_ENGINE_INTAKE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANIUM.png
index fc305ea675..d680025de6 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANIUM.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_GEARBOX_TITANIUM.png
Binary files differ