diff options
author | TimeConqueror <timeconqueror999@gmail.com> | 2021-08-01 16:32:54 +0300 |
---|---|---|
committer | TimeConqueror <timeconqueror999@gmail.com> | 2021-08-01 16:32:54 +0300 |
commit | cf9c771e6606c3593dc3c8418540d191e28dc7ba (patch) | |
tree | 5f77b8ae63e107dddbba69f2a55904763600c061 /src/main/java/gregtech/api | |
parent | 7b9fe5ad03a9bbf79c249956828d3c54d6d04220 (diff) | |
parent | 299f679f82ca60701d9d183b674d79b767270eb0 (diff) | |
download | GT5-Unofficial-cf9c771e6606c3593dc3c8418540d191e28dc7ba.tar.gz GT5-Unofficial-cf9c771e6606c3593dc3c8418540d191e28dc7ba.tar.bz2 GT5-Unofficial-cf9c771e6606c3593dc3c8418540d191e28dc7ba.zip |
Merge remote-tracking branch 'origin/experimental' into boiler
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 905e08a434..9075a0a013 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -2068,7 +2068,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { //SuperconductorUV .add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); SuperconductorUHV.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Blaze.add(SubTag.MAGICAL, SubTag.NO_SMELTING, SubTag.SMELTING_TO_FLUID, SubTag.MORTAR_GRINDABLE, SubTag.UNBURNABLE, SubTag.BURNING); + Blaze.add(SubTag.MAGICAL, SubTag.SMELTING_TO_FLUID, SubTag.MORTAR_GRINDABLE, SubTag.UNBURNABLE, SubTag.BURNING); FierySteel.add(SubTag.MAGICAL, SubTag.UNBURNABLE, SubTag.BURNING); // ElvenElementium .add(SubTag.MAGICAL); DarkThaumium.add(SubTag.MAGICAL); |