upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into weaponry

Browse Source 
Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
This commit is contained in:
Bernhard Bonigl committed 2014-10-16 16:13:11 +02:00
2 parents f1ec9f24da 5a5b05d1c7
commit 65ce5f23c2
11 files changed
+163 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/TConstruct.java
+1 -1
View File
@@ -69,7 +69,7 @@ import cpw.mods.fml.relauncher.Side;
*/
@Mod(modid = "TConstruct", name = "TConstruct", version = "${version}",
dependencies = "required-after:Forge@[10.13.0.1200,);required-after:Mantle@[0.3.1,);after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion")
dependencies = "required-after:Forge@[10.13.0.1200,);required-after:Mantle@[0.3.1,);after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion;after:ThermalFoundation")
public class TConstruct
{
public static final String modVersion = "${version}";