aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tools
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-03-22 18:01:27 +0100
committerGitHub <noreply@github.com>2017-03-22 18:01:27 +0100
commit67f104925ff07120804db83d8b23ae8161f8e44b (patch)
treeb24a05b261d194304d7fcd0a8647c127fcfecd49 /src/main/java/gregtech/common/tools
parentf4dae834dacbac9d765ad597681a53fc067da674 (diff)
parent5e7d95284c4cd8c8be1f2c27b4b745cf81b44fc8 (diff)
downloadGT5-Unofficial-67f104925ff07120804db83d8b23ae8161f8e44b.tar.gz
GT5-Unofficial-67f104925ff07120804db83d8b23ae8161f8e44b.tar.bz2
GT5-Unofficial-67f104925ff07120804db83d8b23ae8161f8e44b.zip
Merge pull request #967 from Dimach/unstable
Fixed incorrect merge, rebase missing commit, resolve conflicts, cleanup code.
Diffstat (limited to 'src/main/java/gregtech/common/tools')
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Scoop.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
index 422ca7af80..5569cab715 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
@@ -27,7 +27,7 @@ public class GT_Tool_Scoop
}
public int getToolDamagePerContainerCraft() {
- return 800;
+ return 200;
}
public int getToolDamagePerEntityAttack() {