aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-05-28 18:16:42 +0200
committerDream-Master <dream-master@gmx.net>2017-05-28 18:16:42 +0200
commita0353c2af270315addf8438f0c5555ab12ffa919 (patch)
tree62c52b7cf662456cccf376353cc6f1e120bcafcf /src
parent208fa4b1729f0590363b79f73731c3135633a9e4 (diff)
downloadGT5-Unofficial-a0353c2af270315addf8438f0c5555ab12ffa919.tar.gz
GT5-Unofficial-a0353c2af270315addf8438f0c5555ab12ffa919.tar.bz2
GT5-Unofficial-a0353c2af270315addf8438f0c5555ab12ffa919.zip
Add Blaze Block
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java5
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java3
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.pngbin0 -> 15979 bytes
3 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index fe6f64ffb2..93b9e93299 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -115,7 +115,7 @@ public class Textures {
BLOCK_VANADIUMSTEEL, BLOCK_HSSG, BLOCK_HSSE, BLOCK_HSSS, BLOCK_AERCRYSTAL, BLOCK_AMBER, BLOCK_AMETHYST, BLOCK_AQUACRYSTAL, BLOCK_BLUETOPAZ, BLOCK_CERTUSQUARTZ, BLOCK_DILITHIUM,
BLOCK_ENDEREYE, BLOCK_ENDERPEARL, BLOCK_FOOLSRUBY, BLOCK_FORCE, BLOCK_FORCICIUM, BLOCK_FORCILLIUM, BLOCK_GREENSAPPHIRE, BLOCK_IGNISCRYSTAL, BLOCK_JASPER, BLOCK_LAZURITE,
BLOCK_LIGNITE, BLOCK_MONAZITE, BLOCK_NITER, BLOCK_OLIVINE, BLOCK_OPAL, BLOCK_ORDOCRYSTAL, BLOCK_PERDITIOCRYSTAL, BLOCK_PHOSPHORUS, BLOCK_QUARTZITE, BLOCK_REDGARNET, BLOCK_RUBY,
- BLOCK_SAPPHIRE, BLOCK_SODALITE, BLOCK_TANZANITE, BLOCK_TERRACRYSTAL, BLOCK_TOPAZ, BLOCK_VINTEUM, BLOCK_YELLOWGARNET, BLOCK_NETHERSTAR, BLOCK_CHARCOAL, MARBLE_STONE, MARBLE_COBBLE,
+ BLOCK_SAPPHIRE, BLOCK_SODALITE, BLOCK_TANZANITE, BLOCK_TERRACRYSTAL, BLOCK_TOPAZ, BLOCK_VINTEUM, BLOCK_YELLOWGARNET, BLOCK_NETHERSTAR, BLOCK_CHARCOAL, BLOCK_BLAZE, MARBLE_STONE, MARBLE_COBBLE,
MARBLE_COBBLE_MOSSY, MARBLE_BRICKS, MARBLE_BRICKS_CRACKED, MARBLE_BRICKS_MOSSY, MARBLE_BRICKS_CHISELED, MARBLE_SMOOTH, BASALT_STONE, BASALT_COBBLE, BASALT_COBBLE_MOSSY, BASALT_BRICKS,
BASALT_BRICKS_CRACKED, BASALT_BRICKS_MOSSY, BASALT_BRICKS_CHISELED, BASALT_SMOOTH, OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE, OVERLAY_FRONT_HEAT_EXCHANGER, OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE,
OVERLAY_FRONT_PROCESSING_ARRAY, OVERLAY_FRONT_OIL_DRILL_ACTIVE, OVERLAY_FRONT_OIL_DRILL, OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE, OVERLAY_FRONT_DIESEL_ENGINE, OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE,
@@ -562,7 +562,8 @@ public class Textures {
BLOCK_VINTEUM,
BLOCK_YELLOWGARNET,
BLOCK_NETHERSTAR,
- BLOCK_CHARCOAL
+ BLOCK_CHARCOAL,
+ BLOCK_BLAZE
};
public static ITexture[]
ERROR_RENDERING = new ITexture[]{
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index e657567bd9..25ebc4636f 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -368,7 +368,8 @@ public class GT_Loader_Item_Block_And_Fluid
Materials.Vinteum,
Materials.GarnetYellow,
Materials.NetherStar,
- Materials.Charcoal
+ Materials.Charcoal,
+ Materials.Blaze
}, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS11);
GregTech_API.sBlockReinforced = new GT_Block_Reinforced("gt.blockreinforced");
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png
new file mode 100644
index 0000000000..71a675010a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png
Binary files differ