diff options
| author | Technus <daniel112092@gmail.com> | 2019-11-01 14:45:13 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2019-11-01 14:45:13 +0100 |
| commit | 61450ec14eabd637e1ce7af6690f3084ee6b2840 (patch) | |
| tree | a7deb443928e4fb0ef7b946bebb5de3973547da3 /build.properties | |
| parent | f39d2183ed9c6a09cc1162ab9156e9241e096a6e (diff) | |
| parent | ca37294a0d8004729795164152b31905b9fc5882 (diff) | |
| download | GT5-Unofficial-61450ec14eabd637e1ce7af6690f3084ee6b2840.tar.gz GT5-Unofficial-61450ec14eabd637e1ce7af6690f3084ee6b2840.tar.bz2 GT5-Unofficial-61450ec14eabd637e1ce7af6690f3084ee6b2840.zip | |
Merge branch 'master' into BassAddons
# Conflicts:
# build.properties
# src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
# src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
# src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.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 35c6c657ea..01b451c567 100644 --- a/build.properties +++ b/build.properties @@ -11,4 +11,4 @@ gregtech.version=5.09.33.23 cofhcore.version=[1.7.10]3.1.4-329-dev cofhlib.version=[1.7.10]1.0.3-175-dev -yamcore.version=0.5.79
\ No newline at end of file +yamcore.version=0.5.79 |