7 commits

Author	SHA1	Message	Date
verinia	b865befb0b	Big woah	2019-06-08 13:03:40 -08:00
verinia	ff14a8bd36	Fixed main.java	2019-06-08 12:29:47 -08:00
verinia	a678fe6618	Merge branch 'master' of https://github.com/dginovker/09HDscape	2019-06-08 12:26:39 -08:00
verinia	4c55322faa	Preparing merge	2019-06-08 12:25:16 -08:00
dginovker	a09c60dac2	Get rid of JavaFX in the server	2019-06-07 23:45:17 -04:00
verinia	d650b93c91	Removed panel	2019-05-29 09:31:07 -08:00
verinia	101b8314c9	Rebase with upstream	2019-05-28 22:15:17 -08:00