Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/NewFeatures' into new-features

Browse source
This commit is contained in:
Dream-Master 2016-07-26 19:41:49 +02:00
commit 7a872dfad2
1 changed files with 229 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/gregtech/api/enums/Textures.java
View file

@ -140,6 +140,24 @@ public class Textures {
CONCRETE_LIGHT_BRICKS_CHISELED, CONCRETE_LIGHT_BRICKS_CHISELED,
CONCRETE_LIGHT_SMOOTH, CONCRETE_LIGHT_SMOOTH,
}, },
STONES = new IIconContainer[]{
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,
},
TURBINE = new IIconContainer[]{ TURBINE = new IIconContainer[]{
LARGETURBINE_ST1, LARGETURBINE_ST1,
LARGETURBINE_ST2, LARGETURBINE_ST2,
@ -255,7 +273,6 @@ public class Textures {
FUSIONII_11, FUSIONII_11,
FUSIONII_12, FUSIONII_12,
}, },
STORAGE_BLOCKS1 = new IIconContainer[]{ STORAGE_BLOCKS1 = new IIconContainer[]{
BLOCK_ADAMANTIUM, BLOCK_ADAMANTIUM,
BLOCK_ALUMINIUM, BLOCK_ALUMINIUM,
@ -274,7 +291,6 @@ public class Textures {
BLOCK_BLUESTEEL, BLOCK_BLUESTEEL,
BLOCK_BRASS BLOCK_BRASS
}, },
STORAGE_BLOCKS2 = new IIconContainer[]{ STORAGE_BLOCKS2 = new IIconContainer[]{
BLOCK_BRONZE, BLOCK_BRONZE,
BLOCK_CAESIUM, BLOCK_CAESIUM,
@ -293,7 +309,6 @@ public class Textures {
BLOCK_DYSPROSIUM, BLOCK_DYSPROSIUM,
BLOCK_ELECTRUM BLOCK_ELECTRUM
}, },
STORAGE_BLOCKS3 = new IIconContainer[]{ STORAGE_BLOCKS3 = new IIconContainer[]{
BLOCK_ELECTRUMFLUX, BLOCK_ELECTRUMFLUX,
BLOCK_ENDERIUM, BLOCK_ENDERIUM,
@ -312,7 +327,6 @@ public class Textures {
BLOCK_IRONWOOD, BLOCK_IRONWOOD,
BLOCK_KANTHAL BLOCK_KANTHAL
}, },
STORAGE_BLOCKS4 = new IIconContainer[]{ STORAGE_BLOCKS4 = new IIconContainer[]{
BLOCK_KNIGHTMETAL, BLOCK_KNIGHTMETAL,
BLOCK_LANTHANUM, BLOCK_LANTHANUM,
@ -331,7 +345,6 @@ public class Textures {
BLOCK_NAQUADAHENRICHED, BLOCK_NAQUADAHENRICHED,
BLOCK_NAQUADRIA BLOCK_NAQUADRIA
}, },
STORAGE_BLOCKS5 = new IIconContainer[]{ STORAGE_BLOCKS5 = new IIconContainer[]{
BLOCK_NEODYMIUM, BLOCK_NEODYMIUM,
BLOCK_NEODYMIUMMAGNETIC, BLOCK_NEODYMIUMMAGNETIC,
@ -350,7 +363,6 @@ public class Textures {
BLOCK_PLUTONIUM241, BLOCK_PLUTONIUM241,
BLOCK_PRASEODYMIUM BLOCK_PRASEODYMIUM
}, },
STORAGE_BLOCKS6 = new IIconContainer[]{ STORAGE_BLOCKS6 = new IIconContainer[]{
BLOCK_PROMETHIUM, BLOCK_PROMETHIUM,
BLOCK_REDALLOY, BLOCK_REDALLOY,
@ -369,7 +381,6 @@ public class Textures {
BLOCK_STEELMAGNETIC, BLOCK_STEELMAGNETIC,
BLOCK_STERLINGSILVER BLOCK_STERLINGSILVER
}, },
STORAGE_BLOCKS7 = new IIconContainer[]{ STORAGE_BLOCKS7 = new IIconContainer[]{
BLOCK_SUNNARIUM, BLOCK_SUNNARIUM,
BLOCK_TANTALUM, BLOCK_TANTALUM,
@ -388,7 +399,6 @@ public class Textures {
BLOCK_URANIUM, BLOCK_URANIUM,
BLOCK_URANIUM235 BLOCK_URANIUM235
}, },
STORAGE_BLOCKS8 = new IIconContainer[]{ STORAGE_BLOCKS8 = new IIconContainer[]{
BLOCK_VANADIUM, BLOCK_VANADIUM,
BLOCK_VANADIUMGALLIUM, BLOCK_VANADIUMGALLIUM,
@ -403,7 +413,6 @@ public class Textures {
BLOCK_HSSE, BLOCK_HSSE,
BLOCK_HSSS BLOCK_HSSS
}, },
STORAGE_BLOCKS9 = new IIconContainer[]{ STORAGE_BLOCKS9 = new IIconContainer[]{
BLOCK_AERCRYSTAL, BLOCK_AERCRYSTAL,
BLOCK_AMBER, BLOCK_AMBER,
@ -422,7 +431,6 @@ public class Textures {
BLOCK_IGNISCRYSTAL, BLOCK_IGNISCRYSTAL,
BLOCK_JASPER BLOCK_JASPER
}, },
STORAGE_BLOCKS10 = new IIconContainer[]{ STORAGE_BLOCKS10 = new IIconContainer[]{
BLOCK_LAZURITE, BLOCK_LAZURITE,
BLOCK_LIGNITE, BLOCK_LIGNITE,
@ -441,7 +449,6 @@ public class Textures {
BLOCK_TANZANITE, BLOCK_TANZANITE,
BLOCK_TERRACRYSTAL BLOCK_TERRACRYSTAL
}, },
STORAGE_BLOCKS11 = new IIconContainer[]{ STORAGE_BLOCKS11 = new IIconContainer[]{
BLOCK_TOPAZ, BLOCK_TOPAZ,
BLOCK_VINTEUM, BLOCK_VINTEUM,