GabrielTofvesson/TeamAvionLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/Launcher/Main.java
This commit is contained in:
Gabriel Tofvesson 2016-11-13 14:23:39 +01:00
commit 34984083ce
4 changed files with 6 additions and 7 deletions

6
src/Launcher/net/Updater.java

@ -17,15 +17,15 @@ public class Updater {
}
public void downloadStuff(){
//TODO: Download lots of stuff
//TODO:
}
public void downloadMoreStuff(){
//TODO: Download more stuff
}
public void downloadEvenMoreStuff(){
//TODO: Download even more stuff
}
public static Updater getInstance(String url) throws IOException {

3
src/assets/layout/instance_userinfo.fxml

@ -2,5 +2,4 @@
<?import javafx.scene.layout.Pane?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1" />
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1" />

2
src/assets/layout/settings_generic.fxml

@ -5,7 +5,7 @@
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Label layoutX="22.0" layoutY="14.0" text="General Settings">
<font>

2
src/assets/layout/settings_minecraft.fxml

@ -4,7 +4,7 @@
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1">
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Label layoutX="22.0" layoutY="14.0" text="Minecraft Settings">
<font>