Merge branch 'master' of https://gitlab.informatik.uni-bremen.de/reswp-2020/galaxytrucker

.gitlab-ci.yml

Server/src/Persistence/Database.java

Server/src/Server.java

build.gradle

core/src/com/galaxytrucker/galaxytruckerreloaded/Main.java

...axytrucker/galaxytruckerreloaded/Model/Planet/Planet.java

...c/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java

...ytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java

...xytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java

...xytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java

...rucker/galaxytruckerreloaded/View/Screen/LoginScreen.java

...xytrucker/galaxytruckerreloaded/View/Screen/MainMenu.java

...ytrucker/galaxytruckerreloaded/View/Screen/PauseMenu.java

...ucker/galaxytruckerreloaded/View/Screen/ShipSelector.java

...rucker/galaxytruckerreloaded/View/UI/Events/GameOver.java

...axytruckerreloaded/View/UI/Inventory/InventorySlotUI.java

.../galaxytruckerreloaded/View/UI/Inventory/InventoryUI.java

...alaxytrucker/galaxytruckerreloaded/View/UI/Map/MapUI.java

...cker/galaxytruckerreloaded/View/UI/Options/OptionsUI.java

...galaxytruckerreloaded/View/UI/ShipInformation/HullUI.java