diff options
| author | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-15 16:04:02 +0100 |
|---|---|---|
| committer | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-15 16:04:02 +0100 |
| commit | ff4b8c7068c2ea7d654e9beda00646d23e62b314 (patch) | |
| tree | 2c84162154ba681232f86dffd4106db530236814 /src/main/java/gtPlusPlus/core/material | |
| parent | 10182ddb54b6df57118cfe0715a037edf0fee14b (diff) | |
| parent | 47ce336f288a45aa3244c8ae1177499fa5080942 (diff) | |
| download | GT5-Unofficial-ff4b8c7068c2ea7d654e9beda00646d23e62b314.tar.gz GT5-Unofficial-ff4b8c7068c2ea7d654e9beda00646d23e62b314.tar.bz2 GT5-Unofficial-ff4b8c7068c2ea7d654e9beda00646d23e62b314.zip | |
Merge tag '1.7.21' into unified-build-script2
# Conflicts:
# build.properties
Diffstat (limited to 'src/main/java/gtPlusPlus/core/material')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java index 0b93e7dd9c..19e8499f02 100644 --- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java +++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java @@ -134,7 +134,7 @@ public final class MISC_MATERIALS { new MaterialStack(ORES.GREENOCKITE, 1), new MaterialStack(ORES.LANTHANITE_CE, 1), new MaterialStack(ORES.AGARDITE_CD, 1), - new MaterialStack(ORES.XENOTIME, 1), + new MaterialStack(ORES.YTTRIALITE, 1), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1), @@ -182,7 +182,7 @@ public final class MISC_MATERIALS { new MaterialStack(ORES.LAUTARITE, 1), new MaterialStack(ORES.DEMICHELEITE_BR, 1), new MaterialStack(ORES.ALBURNITE, 1), - new MaterialStack(ORES.KASHINITE, 1), + new MaterialStack(ORES.SAMARSKITE_Y, 1), new MaterialStack(ORES.AGARDITE_LA, 1), }); |