aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/Materials.java
diff options
context:
space:
mode:
authorDream-MasterXXL <dream-master@gmx.net>2018-12-13 15:02:38 +0100
committerDream-MasterXXL <dream-master@gmx.net>2018-12-13 15:02:38 +0100
commitce6862c7a65a93b7288b7329660bd8ac1ba0e017 (patch)
tree581d01c80bf8c5fa89e17f0fa6b6960fb48be4a3 /src/main/java/gregtech/api/enums/Materials.java
parentb0ea06b93db04b253a9bf656175ef60a1ff46edc (diff)
parente58b29b19fdd7a8befabda194861036e23b59cd4 (diff)
downloadGT5-Unofficial-ce6862c7a65a93b7288b7329660bd8ac1ba0e017.tar.gz
GT5-Unofficial-ce6862c7a65a93b7288b7329660bd8ac1ba0e017.tar.bz2
GT5-Unofficial-ce6862c7a65a93b7288b7329660bd8ac1ba0e017.zip
Merge remote-tracking branch 'origin/Test' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/enums/Materials.java')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 1c25b5eb00..5df572485c 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -896,6 +896,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
@Deprecated public static Materials Wolfram = new Materials(Tungsten, false);
*/
@Deprecated public static Materials Nikolite = new Materials(Electrotine, false);
+ @Deprecated public static Materials Phosphor = new Materials(Phosphorus, false);
public final short[] mRGBa = new short[]{255, 255, 255, 0}, mMoltenRGBa = new short[]{255, 255, 255, 0};