From 75d5897f4db4e97feca4fe4d978cc5823cbbb150 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 17:00:15 +1000 Subject: % Initial Commit --- .../assets/gregtech/textures/gui/PowerSubStation.png | Bin 0 -> 1924 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/resources/assets/gregtech/textures/gui/PowerSubStation.png (limited to 'src/resources') diff --git a/src/resources/assets/gregtech/textures/gui/PowerSubStation.png b/src/resources/assets/gregtech/textures/gui/PowerSubStation.png new file mode 100644 index 0000000000..ba8479807d Binary files /dev/null and b/src/resources/assets/gregtech/textures/gui/PowerSubStation.png differ -- cgit From c250381837a416e58a0ecc632c8a314d8f25b076 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sat, 12 May 2018 18:45:53 +1000 Subject: + Added recipe for the Air Intake Hatch. + Added new textures for the Adv. Vac. Freezer and casings. % Gave old Adv. Vac. Freezer texture to Adv. EBF. % Swapped recipe materials for Adv. Vac. and EBF. --- .../TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png | Bin 601 -> 586 bytes .../TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png | Bin 0 -> 601 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png (limited to 'src/resources') diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png index eb7affaa01..7222ca77d7 100644 Binary files a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png new file mode 100644 index 0000000000..eb7affaa01 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png differ -- cgit From cc960c4aa3697b9f47f1ca050511f5d2a94e63f2 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sun, 13 May 2018 01:03:38 +1000 Subject: + Added Turbine Animations. $ Fixed Large Auto-Assembler Name. $ Possible fix for #239. $ Other Bug Fixes. $ Fixed Old School Circuits breaking Integrated Circuit Recipes. % Made Adv. EBF. Use new casing textures. % Streamlined Old School Circuit function call locations to a single handler. % Cleaned up ASM Logging. --- .../textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png | Bin 0 -> 1762 bytes .../blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta | 5 +++++ .../blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png | Bin 0 -> 1762 bytes .../blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta | 5 +++++ .../blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png | Bin 0 -> 1762 bytes .../TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta | 5 +++++ 6 files changed, 15 insertions(+) create mode 100644 src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png create mode 100644 src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta create mode 100644 src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png create mode 100644 src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta (limited to 'src/resources') diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png b/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png new file mode 100644 index 0000000000..79d89094a5 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..dfae8cae16 --- /dev/null +++ b/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} \ No newline at end of file diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png b/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png new file mode 100644 index 0000000000..79d89094a5 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..dfae8cae16 --- /dev/null +++ b/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png new file mode 100644 index 0000000000..79d89094a5 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..dfae8cae16 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} \ No newline at end of file -- cgit From ab4b246c65795d612d35a8ace09acfe53e4580b4 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sun, 13 May 2018 02:47:16 +1000 Subject: + Added a recipe to turn Ethylbenzene into Styrene and Hydrogen. - Removed ASM logging, unless Hidden NEI entries are shown. $ Hopefully fixes lots of Dehydrator recipes that may not have been working. --- src/resources/mcmod.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/resources') diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 3d2ec378b5..4a78322487 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.", "credits": "", "logoFile": "", - "version": "1.7.0-prerelease-11-final", + "version": "1.7.0-prerelease-14-final", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/GTplusplus/wiki", "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest", -- cgit