diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-08-19 14:24:52 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-08-19 14:24:52 +0200 |
| commit | af8860be2fd3c42091ebca25e4f0663ff9685169 (patch) | |
| tree | 34406bc922233232a59dcae0be5a1a374860ff8b /.gitignore | |
| parent | 967c3c07af627f92200111013b5a7d0e6a176de1 (diff) | |
| parent | e8c75a54ee69b1853b413d3aafbb2ffa02128d19 (diff) | |
| download | GT5-Unofficial-af8860be2fd3c42091ebca25e4f0663ff9685169.tar.gz GT5-Unofficial-af8860be2fd3c42091ebca25e4f0663ff9685169.tar.bz2 GT5-Unofficial-af8860be2fd3c42091ebca25e4f0663ff9685169.zip | |
Merge remote-tracking branch 'origin/unstable' into
CircuitChemistryUpdateFollowup
Conflicts:
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/common/GT_RecipeAdder.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions