diff options
| author | MauveCloud <mauvecloud@yahoo.com> | 2017-03-22 10:40:31 -0700 |
|---|---|---|
| committer | MauveCloud <mauvecloud@yahoo.com> | 2017-03-22 10:40:31 -0700 |
| commit | a230f7b59599dbc804e95489c80944059e74dc4f (patch) | |
| tree | f49a23b510b5e21a6e93ba52ab3dd05e1134e2ad /src/main/java/gregtech/api | |
| parent | e8c819e75fb5cc03eb798442a680b36a04f2a765 (diff) | |
| parent | b20b69b80f5db484746f7561d598f4350eef8f65 (diff) | |
| download | GT5-Unofficial-a230f7b59599dbc804e95489c80944059e74dc4f.tar.gz GT5-Unofficial-a230f7b59599dbc804e95489c80944059e74dc4f.tar.bz2 GT5-Unofficial-a230f7b59599dbc804e95489c80944059e74dc4f.zip | |
Merge remote-tracking branch 'refs/remotes/Blood-Asp/unstable' into unstable
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 |