AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 19:25:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers

Browse Source
This commit is contained in:
Florian Nücke 2014-07-11 17:08:06 +02:00
commit bf79d15a25
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/common/recipe/Recipes.scala
View File

@ -69,7 +69,7 @@ object Recipes {
if (!userRecipes.exists()) { if (!userRecipes.exists()) {
FileUtils.copyURLToFile(getClass.getResource("/assets/opencomputers/recipes/user.recipes"), userRecipes) FileUtils.copyURLToFile(getClass.getResource("/assets/opencomputers/recipes/user.recipes"), userRecipes)
} }
val config = ConfigParseOptions.defaults. lazy val config: ConfigParseOptions = ConfigParseOptions.defaults.
setSyntax(ConfigSyntax.CONF). setSyntax(ConfigSyntax.CONF).
setIncluder(new ConfigIncluder with ConfigIncluderFile { setIncluder(new ConfigIncluder with ConfigIncluderFile {
var fallback: ConfigIncluder = _ var fallback: ConfigIncluder = _
@ -83,7 +83,7 @@ object Recipes {
override def includeFile(context: ConfigIncludeContext, what: File) = { override def includeFile(context: ConfigIncludeContext, what: File) = {
val in = if (what.isAbsolute) new FileReader(what) else new FileReader(new File(userRecipes.getParentFile, what.getPath)) val in = if (what.isAbsolute) new FileReader(what) else new FileReader(new File(userRecipes.getParentFile, what.getPath))
val result = ConfigFactory.parseReader(in) val result = ConfigFactory.parseReader(in, config)
in.close() in.close()
result.root() result.root()
} }