diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-04-10 23:10:19 +0200 |
|---|---|---|
| committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-04-10 23:10:19 +0200 |
| commit | 20206b2b6d18fda49175adae8b0db93e95887de3 (patch) | |
| tree | 1c888354b30b1bc7cfcc9424f8dda43fd8828430 | |
| parent | 515c98ccc43ac17ff832e480cecac9032dcff093 (diff) | |
| parent | 8824fa25d3638baa19d57a0a43497b830dc380e7 (diff) | |
| download | GT5-Unofficial-20206b2b6d18fda49175adae8b0db93e95887de3.tar.gz GT5-Unofficial-20206b2b6d18fda49175adae8b0db93e95887de3.tar.bz2 GT5-Unofficial-20206b2b6d18fda49175adae8b0db93e95887de3.zip | |
Merge remote-tracking branch 'origin/fixes' into fixes
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 1 | ||||
| -rw-r--r-- | src/main/resources/assets/gregtech/lang/en_US.lang | 5 |
3 files changed, 2 insertions, 6 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 || diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 89b8f0ab02..ad329776db 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -824,11 +824,6 @@ achievement.gt.blockmachines.multimachine.em.infuser.desc=Pickup this item to se achievement.gt.blockmachines.hatch.holder.tier.09=Object Holder achievement.gt.blockmachines.hatch.holder.tier.09.desc=Pickup this item to see the recipe in NEI -achievement.gt.blockmachines.multimachine.oredrill5=Ore Drill Plant V -achievement.gt.blockmachines.multimachine.oredrill5.desc=Pickup this item to see the recipe in NEI -achievement.gt.blockmachines.multimachine.oredrill6=Ore Drill Plant VI -achievement.gt.blockmachines.multimachine.oredrill6.desc=Pickup this item to see the recipe in NEI - achievement.item.StargateShieldingFoil=Stargate-Radiation-Containment-Plate achievement.item.StargateShieldingFoil.desc=Pickup this item to see the recipe in NEI achievement.item.StargateChevron=Stargate Chevron |