diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-04-10 22:11:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 22:11:43 +0200 |
| commit | 8824fa25d3638baa19d57a0a43497b830dc380e7 (patch) | |
| tree | fede4ca12c98451107ed6277cd027e3885275868 /src/main/java | |
| parent | fcca889bacbccd38f617cbcffcdf3dcb67c93238 (diff) | |
| parent | bd10bd57d3db003f63a7abd59422a27894358355 (diff) | |
| download | GT5-Unofficial-8824fa25d3638baa19d57a0a43497b830dc380e7.tar.gz GT5-Unofficial-8824fa25d3638baa19d57a0a43497b830dc380e7.tar.bz2 GT5-Unofficial-8824fa25d3638baa19d57a0a43497b830dc380e7.zip | |
Merge branch 'experimental' into fixes
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 5b0607b282..6d5c9e375c 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -766,7 +766,7 @@ public class GT_Mod implements IGT_Mod { new GT_Worldgenloader().run(); new GT_CoverLoader().run(); new GT_AE2EnergyTunnelLoader().run(); - + LoadArmorComponents.init(); GT_RecipeRegistrator.registerUsagesForMaterials(null, false, new ItemStack(Blocks.planks, 1), new ItemStack(Blocks.cobblestone, 1), new ItemStack(Blocks.stone, 1), new ItemStack(Items.leather, 1)); diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 427bcd531e..86c2812c5c 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -726,6 +726,7 @@ public enum OrePrefixes { aMaterial == Materials.Nichrome || aMaterial == Materials.BlackSteel || aMaterial == Materials.Titanium || aMaterial == Materials.TungstenSteel || aMaterial == Materials.Tungsten || aMaterial == Materials.HSSG || aMaterial == Materials.NaquadahAlloy || aMaterial == Materials.Duranium || aMaterial == Materials.Europium || aMaterial == Materials.Bedrockium)) + foil.mDisabledItems.add(aMaterial); //Fine Wire if (!enableUnusedFineWires && !(aMaterial == Materials.Steel || aMaterial == Materials.AnnealedCopper || aMaterial == Materials.Platinum || aMaterial == Materials.Osmium || |