From 0f2d00abf3a4688e78a7eee381712279dd5a89bb Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 8 Aug 2012 23:44:32 -0700 Subject: [PATCH] Include conf folder and merge config in source zip --- build.xml | 4 +++- install/install.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 2084f4bde2..6fb13f2e04 100644 --- a/build.xml +++ b/build.xml @@ -64,6 +64,7 @@ + @@ -224,13 +225,14 @@ - + + diff --git a/install/install.py b/install/install.py index 3317bcaa43..3705ebd5b2 100644 --- a/install/install.py +++ b/install/install.py @@ -2,9 +2,9 @@ import os, os.path, sys from fml import setup_fml, finish_setup_fml, apply_fml_patches, setup_mcp -def fml_main(fml_dir, mcp_dir): +def fml_main(fml_dir, mcp_dir, dont_gen_conf=True): print '================ Forge ModLoader Setup Start ===================' - setup_mcp(fml_dir, mcp_dir) + setup_mcp(fml_dir, mcp_dir, dont_gen_conf) setup_fml(fml_dir, mcp_dir) apply_fml_patches(fml_dir, mcp_dir, os.path.join(mcp_dir, 'src')) finish_setup_fml(fml_dir, mcp_dir)