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

Fix merge conflicts

Browse Source
This commit is contained in:
mDiyo committed 2014-06-30 09:22:30 -08:00
2 parents 5a87c102ea 6ca6f9eacf
commit 145f7b9724
37 files changed
+3017 -776
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/TConstruct.java
+7 -4
View File
@@ -66,18 +66,21 @@ public class TConstruct
public static final int liquidUpdateAmount = 6;
// the entire mod
public static final String modID = "TConstruct";
// Shared mod logger
public static final Logger logger = LogManager.getLogger("TConstruct");
public static final Logger logger = LogManager.getLogger(modID);
/* Instance of this mod, used for grabbing prototype fields */
@Instance("TConstruct")
@Instance(modID)
public static TConstruct instance;
/* Proxies for sides, used for graphics processing */
@SidedProxy(clientSide = "tconstruct.client.TProxyClient", serverSide = "tconstruct.common.TProxyCommon")
public static TProxyCommon proxy;
// Module loader
public static final ModuleController moduleLoader = new ModuleController("TDynstruct.cfg", "TConstruct");
public static final ModuleController moduleLoader = new ModuleController("TDynstruct.cfg", modID);
// The packet pipeline
public static final PacketPipeline packetPipeline = new PacketPipeline();
@@ -159,7 +162,7 @@ public class TConstruct
packetPipeline.initalise();
if (event.getSide() == Side.CLIENT)
{
MinecraftForge.EVENT_BUS.register(new EventCloakRender());
//MinecraftForge.EVENT_BUS.register(new EventCloakRender());
}
DimensionBlacklist.getBadBimensions();