Gabriel Tofvesson b741ab636d Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	src/Launcher/Main.java
#	src/assets/layout/modpacks.fxml

2016-11-04 20:51:38 +01:00

..

home.fxml

Chnaged things

2016-11-04 20:44:58 +01:00

main.fxml

Chnaged things

2016-11-04 20:44:58 +01:00

modpacks.fxml

Merge remote-tracking branch 'origin/master'

2016-11-04 20:51:38 +01:00

sample.fxml

Moved layouts

2016-10-30 15:47:01 +01:00

settings.fxml

Chnaged things

2016-11-04 20:44:58 +01:00