diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-02-08 22:15:43 +0100 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2022-02-08 22:15:43 +0100 |
| commit | 539c60bb8df31a972b023751a4710c3d949e2845 (patch) | |
| tree | f9d23730b5c36995fb0adb94bb29b52cdeff7101 | |
| parent | 044967421a6b2f4b01a09d4b80d7704db56e14be (diff) | |
| parent | da2529429f0745600a9e4afa2b7f358397271ae2 (diff) | |
| download | GT5-Unofficial-539c60bb8df31a972b023751a4710c3d949e2845.tar.gz GT5-Unofficial-539c60bb8df31a972b023751a4710c3d949e2845.tar.bz2 GT5-Unofficial-539c60bb8df31a972b023751a4710c3d949e2845.zip | |
Merge remote-tracking branch 'Technus/master' into upstream
# Conflicts:
# dependencies.gradle
99 files changed, 926 insertions, 1882 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 6fbbce96c2..5dd7cef74e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,9 +5,11 @@ dependencies { compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.31:dev") compile("com.github.GTNewHorizons:Yamcl:0.5.82:dev") - compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') { - transitive = false - } + compile("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev") + compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.1:dev") + compile("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev") + compile("com.github.GTNewHorizons:StructureLib:1.0.14:dev") + compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") compileOnly("com.github.GTNewHorizons:OpenComputers:1.7.5.21-GTNH:dev") { transitive = false diff --git a/dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar b/dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar Binary files differnew file mode 100644 index 0000000000..2891f1480f --- /dev/null +++ b/dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index c281304205..fe85fc08c5 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -2,8 +2,8 @@ package com.github.technus.tectech; import com.github.technus.tectech.loader.MainLoader; import com.github.technus.tectech.loader.TecTechConfig; -import com.github.technus.tectech.loader.gui.CreativeTabTecTech; import com.github.technus.tectech.loader.gui.CreativeTabEM; +import com.github.technus.tectech.loader.gui.CreativeTabTecTech; import com.github.technus.tectech.mechanics.anomaly.AnomalyHandler; import com.github.technus.tectech.mechanics.anomaly.CancerCo |