Merge branch 'master' of

[email protected]:WPIRoboticsEngineering/2001_Field_Controller.git Conflicts: src/main/java/com/FieldSimulator/FieldSimulator_2001/Main.java src/main/resources/fxml/MainScreen.fxml
WPIRoboticsEngineering · Aug 10, 2018 · 6b81c69 · 6b81c69
2 parents eb925e6 + 4345ad3
commit 6b81c69
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 /bin/
 /.classpath
 /.project
+/.settings
diff --git a/.settings/.gitignore b/.settings/.gitignore
diff --git a/src/main/java/com/FieldSimulator/FieldSimulator_2001/Main.java b/src/main/java/com/FieldSimulator/FieldSimulator_2001/Main.java
@@ -21,6 +21,7 @@ public void start(Stage primaryStage) throws Exception {
 		primaryStage.setTitle("Field Simulator");
 		root.getStylesheets().add("/materialfx-material-design-for-javafx/material-fx-v0_3.css");
 		primaryStage.setScene(new Scene(root, 1150, 340));
+	    primaryStage.setResizable(false);
 
 		primaryStage.show();
 		primaryStage.getScene().setRoot(root);