aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGTNH-Afx237v7 <64365566+GTNH-Afx237v7@users.noreply.github.com>2021-07-04 13:42:03 +0200
committerGitHub <noreply@github.com>2021-07-04 13:42:03 +0200
commit0b7e565f9cba924b41341a784e0a08e62d0e6413 (patch)
treefc3dd7d6ec344bd9dec4ae3893ab4e4a86002011 /src
parent94479be9dad038bd8eb4e65041e0b2b0260cf11e (diff)
parent7304b277aa27a5ad81ccf8f8c191479d69f9bafa (diff)
downloadGT5-Unofficial-0b7e565f9cba924b41341a784e0a08e62d0e6413.tar.gz
GT5-Unofficial-0b7e565f9cba924b41341a784e0a08e62d0e6413.tar.bz2
GT5-Unofficial-0b7e565f9cba924b41341a784e0a08e62d0e6413.zip
Merge branch 'GTNewHorizons:master' into master
Former-commit-id: d151100a8dc427ec4063c9be4e7521fecd12249c
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java
index f61ce70c81..d3a5d79729 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java
@@ -100,11 +100,6 @@ public class BridgeMaterialsLoader implements IWerkstoffRunnable {
}
werkstoffBridgeMaterial.mName = werkstoff.getVarName();
werkstoffBridgeMaterial.mDefaultLocalName = werkstoff.getDefaultName();
- try {
- Field f = Materials.class.getField("mLocalizedName");
- f.set(werkstoffBridgeMaterial, werkstoff.getDefaultName());
- } catch (NoSuchFieldException | IllegalAccessException ignored) {
- }
werkstoffBridgeMaterial.mChemicalFormula = werkstoff.getToolTip();
if (LoaderReference.Thaumcraft)
werkstoffBridgeMaterial.mAspects = werkstoff.getGTWrappedTCAspects();
@@ -119,4 +114,4 @@ public class BridgeMaterialsLoader implements IWerkstoffRunnable {
}
}
}
-} \ No newline at end of file
+}