diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-03-22 18:01:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 18:01:27 +0100 |
| commit | 67f104925ff07120804db83d8b23ae8161f8e44b (patch) | |
| tree | b24a05b261d194304d7fcd0a8647c127fcfecd49 /src/main/java/gregtech/api | |
| parent | f4dae834dacbac9d765ad597681a53fc067da674 (diff) | |
| parent | 5e7d95284c4cd8c8be1f2c27b4b745cf81b44fc8 (diff) | |
| download | GT5-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/api')
| -rw-r--r-- | src/main/java/gregtech/api/enums/ConfigCategories.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java index 51eead9adf..1919441539 100644 --- a/src/main/java/gregtech/api/enums/ConfigCategories.java +++ b/src/main/java/gregtech/api/enums/ConfigCategories.java @@ -60,6 +60,7 @@ public enum ConfigCategories { hammerdoubleplate, hammertripleplate, hammerquadrupleplate, - hammerquintupleplate; + hammerquintupleplate, + scoop; } }
\ No newline at end of file |