Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MERGE] Development into master #16

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open

[MERGE] Development into master #16

wants to merge 47 commits into from

Conversation

JKetelaar
Copy link
Member

No description provided.

SandroCoutinho and others added 30 commits September 24, 2016 17:54
[FEATURE] First-release requirements
Set controller to right location in fxml file
Revamped the UI totally
Updated pom with jfoenix for UI
Added Hiding of serverTextfield
- Added todo's for JKetelaar.
- Handled setting java version
[FEATURE] Version Checking & Client Downloading
# Conflicts:
#	pom.xml
#	src/main/java/org/parabot/launcher/Core.java
- Added ServerTextField showing and hiding
- Graphical Changes.
JKetelaar added 3 commits May 9, 2017 16:01
…pment

# Conflicts:
#	src/main/java/org/parabot/launcher/Controller.java
#	src/main/java/org/parabot/launcher/data/Configuration.java
#	src/main/java/org/parabot/launcher/helpers/Launcher.java
#	src/main/java/org/parabot/launcher/helpers/VersionHelper.java
#	src/main/java/org/parabot/launcher/io/Writer.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants