diff options
| author | Technus <daniel112092@gmail.com> | 2020-04-07 06:19:25 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2020-04-07 06:19:25 +0200 |
| commit | 5de758036a52ad0467c3d56786c2e7a99c8e123b (patch) | |
| tree | 4e1c4e2f4bbf27f6a96571adcad52344d5db8645 /build.properties | |
| parent | fefcabc97d7682017a5293bbc92000b6a0668fc0 (diff) | |
| parent | ecb77f163850d96176e068bd2912b79b5a75ab0b (diff) | |
| download | GT5-Unofficial-5de758036a52ad0467c3d56786c2e7a99c8e123b.tar.gz GT5-Unofficial-5de758036a52ad0467c3d56786c2e7a99c8e123b.tar.bz2 GT5-Unofficial-5de758036a52ad0467c3d56786c2e7a99c8e123b.zip | |
Merge branch 'Ore-Drilling-T5+T6' of https://github.com/GTNewHorizons/GT5-Unofficial into Ore-Drilling-T5+T6
# Conflicts:
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant5.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java
Diffstat (limited to 'build.properties')
| -rw-r--r-- | build.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build.properties b/build.properties index 78d8ff17da..f55c51fd00 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -gt.version=5.09.33.37-Ore-Drill +gt.version=5.09.33.38-Ore-Drill ae2.version=rv3-beta-22 applecore.version=1.7.10-1.2.1+107.59407 |