Merge branch 'master-1.8' of https://github.com/CyclopsMC/CyclopsCore …

…into master-1.8
CyclopsMC · Feb 5, 2016 · ddfc5ab · ddfc5ab
2 parents cbccbbe + aff82bf
commit ddfc5ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/resources/changelog/1.8.9-0.5.0.txt b/resources/changelog/1.8.9-0.5.0.txt
@@ -11,6 +11,7 @@ Fixes:
 * Fix broken client to server packets, Closes #9
 * Take into account isKeepNBTOnDrop() when dropping block items
 * Fix aim of player-targeted item dropping
+* Fix external recipes not being loaded
 
 Lib features:
 * Add empty icon

diff --git a/src/main/java/org/cyclops/cyclopscore/init/RecipeHandler.java b/src/main/java/org/cyclops/cyclopscore/init/RecipeHandler.java
@@ -85,6 +85,7 @@ protected List<XmlRecipeLoader> registerRecipesForFiles(File file, Map<String, X
                             childFile, internalLoaders, getExternalRecipesPattern().equals(file.getName())
                     ));
                 }
+                return loaders;
             }
         }
         return Collections.emptyList();
-Original file line number
+Diff line change
@@ Expand Up @@
                                 childFile, internalLoaders, getExternalRecipesPattern().equals(file.getName())
                         ));
                     }
+                    return loaders;
                 }
             }
             return Collections.emptyList();
@@ Expand Down @@