diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-24 11:54:30 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-24 11:54:30 +1000 |
| commit | ecf908e98ccee72a713091e8ab547e35a41d7436 (patch) | |
| tree | f0dade1481aa02fd0ac4fcf8a672cc7a761a0547 /src/Java/gtPlusPlus/core/recipe/common | |
| parent | b9fe3352840abe0846834cefd578895ec6f5e520 (diff) | |
| parent | fa5de3584ce7bc97ce6f32b31f6062b5b6e89e75 (diff) | |
| download | GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.gz GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.bz2 GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.zip | |
> Why does Git make me do these? arghhh...
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
# Conflicts:
# src/Java/gtPlusPlus/core/material/ALLOY.java
# src/Java/gtPlusPlus/core/material/ELEMENT.java
# src/Java/gtPlusPlus/core/material/Material.java
# src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe/common')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/common/CI.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 2d857ca25a..9159025922 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -2,6 +2,7 @@ package gtPlusPlus.core.recipe.common; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ALLOY; @@ -389,18 +390,18 @@ public class CI { if (material instanceof Materials){ //return (ItemStack) type.get(material); String materialName = ((Materials) material).mDefaultLocalName; - Utils.LOG_INFO("Searching for a component named "+type.name()+materialName); + Logger.INFO("Searching for a component named "+type.name()+materialName); //return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1); return (type.name()+materialName); } else { String materialName = (Utils.sanitizeString(((Material) material).getLocalizedName())); - Utils.LOG_INFO("Searching for a component named "+type.name()+materialName); + Logger.INFO("Searching for a component named "+type.name()+materialName); //return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1); return (type.name()+materialName); } } - Utils.LOG_INFO("[Components] Failed getting a tiered component. "+type.name()+" | "+tier); + Logger.INFO("[Components] Failed getting a tiered component. "+type.name()+" | "+tier); return null; } |