diff options
| author | Technus <daniel112092@gmail.com> | 2017-09-18 21:06:32 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-09-18 21:06:32 +0200 |
| commit | fb672e3cdc8040327643a89ed2ee2c96034ac3a6 (patch) | |
| tree | 63240949b11940daeb0e39fe83d2dce362571177 /src | |
| parent | ede698dbd1822b03276a2d960d475070e033099e (diff) | |
| parent | 9fbcf1cd7eeaa134c802f2196a1b50cbee6d7b7c (diff) | |
| download | GT5-Unofficial-fb672e3cdc8040327643a89ed2ee2c96034ac3a6.tar.gz GT5-Unofficial-fb672e3cdc8040327643a89ed2ee2c96034ac3a6.tar.bz2 GT5-Unofficial-fb672e3cdc8040327643a89ed2ee2c96034ac3a6.zip | |
Merge branch 'master' into nh-recipes
# Conflicts:
# src/main/java/com/github/technus/tectech/elementalMatter/core/tElementalRecipeCollision.java
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/elementalMatter/core/tElementalRecipeCollision.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/tElementalRecipeCollision.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/tElementalRecipeCollision.java deleted file mode 100644 index c3f007de48..0000000000 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/tElementalRecipeCollision.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.technus.tectech.elementalMatter.core; - -/** - * Created by danie_000 on 19.11.2016. - */ -public final class tElementalRecipeCollision extends Exception { - public tElementalRecipeCollision(String message) { - super(message); - } -} |