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/tileentities/base | |
| 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/tileentities/base')
| -rw-r--r-- | src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java index 9acb5ae396..81dfb1acf4 100644 --- a/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java +++ b/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.tileentities.base; import java.util.UUID; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -60,7 +60,7 @@ public abstract class TileEntityBase extends TileEntity implements ISidedInvento onPreTick(); } } catch (Throwable t){ - Utils.LOG_ERROR("Tile Entity Encountered an error in it's pre-tick stage."); + Logger.ERROR("Tile Entity Encountered an error in it's pre-tick stage."); t.printStackTrace(); } try{ @@ -68,7 +68,7 @@ public abstract class TileEntityBase extends TileEntity implements ISidedInvento onTick(); } } catch (Throwable t){ - Utils.LOG_ERROR("Tile Entity Encountered an error in it's tick stage."); + Logger.ERROR("Tile Entity Encountered an error in it's tick stage."); t.printStackTrace(); } try{ @@ -76,7 +76,7 @@ public abstract class TileEntityBase extends TileEntity implements ISidedInvento onPostTick(); } } catch (Throwable t){ - Utils.LOG_ERROR("Tile Entity Encountered an error in it's post-tick stage."); + Logger.ERROR("Tile Entity Encountered an error in it's post-tick stage."); t.printStackTrace(); } } @@ -92,7 +92,7 @@ public abstract class TileEntityBase extends TileEntity implements ISidedInvento processRecipe(); } } catch (Throwable t){ - Utils.LOG_ERROR("Tile Entity Encountered an error in it's processing of a recipe stage."); + Logger.ERROR("Tile Entity Encountered an error in it's processing of a recipe stage."); t.printStackTrace(); } return true; |