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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Alexander committed 2014-02-20 15:05:15 -05:00
2 parents db764e4fa1 5d8f03ce0d
commit 46fe013ccc
6 files changed
+115 -196
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/client/TProxyClient.java
+3 -1
View File
@@ -135,6 +135,7 @@ import tconstruct.entity.projectile.ArrowEntity;
import tconstruct.entity.projectile.DaggerEntity;
import tconstruct.entity.projectile.LaunchedPotion;
import tconstruct.inventory.ContainerLandmine;
import tconstruct.items.ManualInfo;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.client.TConstructClientRegistry;
import tconstruct.library.client.ToolGuiElement;
@@ -361,7 +362,7 @@ public class TProxyClient extends TProxyCommon
public static Document volume1;
public static Document volume2;
public static Document smelter;
public static ManualInfo manualData;
@Override
public void readManuals ()
{
@@ -373,6 +374,7 @@ public class TProxyClient extends TProxyCommon
initManualIcons();
initManualRecipes();
initManualPages();
manualData = new ManualInfo();
}
Document readManual (String location, DocumentBuilderFactory dbFactory)