Merge branch 'master' into weaponry

Conflicts:
	src/main/java/tconstruct/tools/ToolProxyClient.java
This commit is contained in:
Bernhard Bonigl committed 2014-10-26 17:10:09 +01:00
commit 947da8f9df
21 files changed
+2127 -38

No files matched your search

@@ -49,11 +49,39 @@ public class TProxyClient extends TProxyCommon
public void readManuals ()
{
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
diary = readManual("/assets/tinker/manuals/diary.xml", dbFactory);
volume1 = readManual("/assets/tinker/manuals/firstday.xml", dbFactory);
volume2 = readManual("/assets/tinker/manuals/materials.xml", dbFactory);
smelter = readManual("/assets/tinker/manuals/smeltery.xml", dbFactory);
initManualIcons();
String CurrentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode();
Document diary_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/diary.xml", dbFactory);
Document volume1_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/firstday.xml", dbFactory);
Document volume2_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/materials.xml", dbFactory);
Document smelter_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/smeltery.xml", dbFactory);
diary = readManual("/assets/tinker/manuals/en_US/diary.xml", dbFactory);
volume1 = readManual("/assets/tinker/manuals/en_US/firstday.xml", dbFactory);
volume2 = readManual("/assets/tinker/manuals/en_US/materials.xml", dbFactory);
smelter = readManual("/assets/tinker/manuals/en_US/smeltery.xml", dbFactory);
if(diary_cl != null)
{
diary = diary_cl;
}
if(volume1_cl != null)
{
volume1 = volume1_cl;
}
if(volume2_cl != null)
{
volume2 = volume2_cl;
}
if(smelter_cl != null)
{
smelter = smelter_cl;
}
initManualIcons();
initManualRecipes();
initManualPages();
manualData = new ManualInfo();