Merge remote-tracking branch 'origin/master'

This commit is contained in:
Gabriel Tofvesson 2016-11-06 17:58:43 +01:00
commit 9008533010

View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?>
<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.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>
<Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
@ -14,5 +14,11 @@
<Font name="Centaur" size="31.0" />
</font>
</Label>
<Button id="Launch-VM" layoutX="34.0" layoutY="105.0" mnemonicParsing="false" text="Launch" />
<Label layoutX="34.0" layoutY="79.0" text="Vanilla Minecraft" textFill="WHITE">
<font>
<Font name="Centaur" size="21.0" />
</font>
</Label>
</children>
</Pane>
</Pane>