Merge branch 'master' into experimental

This commit is contained in:
Bernhard Bonigl committed 2014-11-26 22:37:25 +01:00
commit e47b570915
14 files changed
+270 -10

No files matched your search

+1 -1
View File
@@ -36,7 +36,7 @@ import tconstruct.plugins.ic2.TinkerIC2;
import tconstruct.plugins.imc.TinkerAE2;
import tconstruct.plugins.imc.TinkerBuildCraft;
import tconstruct.plugins.imc.TinkerMystcraft;
import tconstruct.plugins.imc.TinkerThaumcraft;
import tconstruct.plugins.TinkerThaumcraft;
import tconstruct.plugins.mfr.TinkerMFR;
import tconstruct.plugins.te4.TinkerTE4;
import tconstruct.plugins.waila.TinkerWaila;