Merge remote-tracking branch 'upstream/master'

2013-06-12 21:48:49 -04:00
parent d54b7c287f e531c1e301
commit 2990e393e8
12 changed files with 217 additions and 27 deletions
--- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -2,6 +2,7 @@ package StevenDimDoors.mod_pocketDim;


 import java.io.File;
+
 import java.util.ArrayList;
 import java.util.HashMap;

@@ -269,6 +270,7 @@ public class mod_pocketDim
    	
    	dungeonHelper.importCustomDungeons(schematicDir);
    	dungeonHelper.registerBaseDungeons();
+    	dungeonHelper.registerDungeonTypeTags();