diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-06-18 02:38:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 02:38:17 +0200 |
| commit | 5deb1f04fb5c1c5dcd07b6b833b2f31a3e2a4521 (patch) | |
| tree | 540301c348908d78adbcff2fcb20331319e0e718 /src/main/java/gregtech/api | |
| parent | a59d2fbaed3057b8f5ad4961ee65b4ef7a5e0693 (diff) | |
| parent | 3e5b4f63967ed306a74f8f597a66185d76c7f335 (diff) | |
| download | GT5-Unofficial-5deb1f04fb5c1c5dcd07b6b833b2f31a3e2a4521.tar.gz GT5-Unofficial-5deb1f04fb5c1c5dcd07b6b833b2f31a3e2a4521.tar.bz2 GT5-Unofficial-5deb1f04fb5c1c5dcd07b6b833b2f31a3e2a4521.zip | |
Merge branch 'experimental' into scanner_fixes
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Assemblyline_Server.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java index 13bac88f91..0374f221a8 100644 --- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java +++ b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java @@ -36,6 +36,7 @@ public class GT_Assemblyline_Server { for (Map.Entry<String, Property> entry : internal.entrySet()) { s=entry.getValue().getString().replaceAll("%", ""); + if (entry.getKey().contains("metaitem") && s.contains("material")) internal2.put(entry.getKey(), s); else if (entry.getKey().contains("blockmachines") && s.contains("material")) @@ -87,7 +88,6 @@ public class GT_Assemblyline_Server { i=i%1000; lServerNames.put(entry.getKey(), entry.getValue().replace("material",GregTech_API.sGeneratedMaterials[i].toString())); } - else if(entry.getKey().contains("blockmetal")) { Materials[] mMats = null; String t = entry.getKey().substring("gt.blockmetal".length()); |