Skip to content
This repository was archived by the owner on Jan 19, 2018. It is now read-only.

Configuration file #33

Merged
merged 9 commits into from
Oct 27, 2013
Merged

Configuration file #33

merged 9 commits into from
Oct 27, 2013

Conversation

SuborbitalPigeon
Copy link
Member

This is probably able to be merged now

webpigeon and others added 9 commits October 27, 2013 11:07
This is the first draft of the configuration system to stop so many
commits being needed to fix the name in the repo. As per Bruce's
request.

This relies on the Java properties class and will need
uc_pircbotx.properties to be copied to the working directory in order to
work correctly. All options have defaults which are are the same as the
hard coded values being used.
I have also added the JSON based configuration file format for
comparison. We can then delete the one we don't use before it's merged.
I have made the trigger configurable as well
Also fix the copyrights
This commit formats the code using the codestyle.xml formatting used by
Bruce. I have commited the changes and netbeans configuration file in
this commit to, so other netbeans users can use the config :).
probably due to commit conflict (sorry bruce :) )
SuborbitalPigeon added a commit that referenced this pull request Oct 27, 2013
@SuborbitalPigeon SuborbitalPigeon merged commit b6775bf into master Oct 27, 2013
@SuborbitalPigeon SuborbitalPigeon deleted the configuration branch October 27, 2013 13:55
@webpigeon webpigeon restored the configuration branch October 27, 2013 14:06
@webpigeon webpigeon deleted the configuration branch October 27, 2013 14:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants