diff options
| author | Tec <daniel112092@gmail.com> | 2019-08-27 22:19:38 +0200 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2019-08-27 22:19:38 +0200 |
| commit | fe181c4330f9899238407c4f86119505efc1a7b0 (patch) | |
| tree | b4dccc3590204a3a91a8fffd0d8fb6de5901ab84 /.gitignore | |
| parent | a560a97a4376e8ac198cd686b633f6f7b06c31e7 (diff) | |
| parent | e5354f073336ee89f330781d2a9d8058839e9074 (diff) | |
| download | GT5-Unofficial-fe181c4330f9899238407c4f86119505efc1a7b0.tar.gz GT5-Unofficial-fe181c4330f9899238407c4f86119505efc1a7b0.tar.bz2 GT5-Unofficial-fe181c4330f9899238407c4f86119505efc1a7b0.zip | |
Merge branch 'master' into BassAddons
# Conflicts:
# src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
# src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java
# src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4b05cbe9e4..2b05b0c5ea 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ GregTech.cfg options.txt GregTech.lang mods/ +classes/ +logs/ |