Merge branch 'master' into network

.gitlab-ci.yml

 image: java:latest
 
 stages:
-  - tex
   - assemble
   - build
   - javadoc
@@ -11,18 +10,6 @@ cache:
   paths:
     - .gradle/wrapper
     - .gradle/caches
-
-tex:
-  image: tianon/latex
-  stage: tex
-  script:
-    - cd doc
-    - pdflatex Architekturbeschreibung.tex
-    - pdflatex Architekturbeschreibung.tex
-    - cd ..
-  artifacts:
-    paths:
-      - doc/Architekturbeschreibung.pdf
       
 assemble:
   stage: assemble

core/assets/desktop.ini

+[LocalizedFileNames]
+autofire_on.png=@autofire_on,0
+store_close_on.png=@store_close_on,0
+top_ship_on.png=@top_ship_on,0
+sell_buy_on.png=@sell_buy_on,0
+continue_on.png=@continue_on,0
+pause.png=@pause,0