Merge branch 'trader'

9621edad · Fabian · d735324c · e6874d37 · 9621edad · 9621edad
Commit 9621edad authored 4 years ago by Fabian
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/customizeUI/button_normal_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/customizeUI/button_normal_on.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/customizeUI/button_typea_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/customizeUI/button_typea_on.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/customizeUI/button_typeb_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/customizeUI/button_typeb_on.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/customizeUI/button_typec_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/customizeUI/button_typec_on.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/misc/crosshairs_placed.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/misc/crosshairs_placed.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_engines_green1.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_engines_green1.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_engines_orange1.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_engines_orange1.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_engines_overlay.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_engines_overlay.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_engines_red1.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_engines_red1.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/low_o2_stripes_1x2.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/low_o2_stripes_1x2.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/low_o2_stripes_2x1.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/low_o2_stripes_2x1.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/low_o2_stripes_2x2.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/low_o2_stripes_2x2.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_shields_green1.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_shields_green1.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_shields_orange1.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_shields_orange1.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_shields_overlay.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_shields_overlay.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_shields_red1.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/icons/s_shields_red1.png
--- a/core/assets/shipsys/weapon/desktop.ini
+++ b/core/assets/shipsys/weapon/desktop.ini
+[LocalizedFileNames]
+box_weapons_on.png=@box_weapons_on,0
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/box_weapons_bottom3.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/box_weapons_bottom3.png
--- a/core/assets/shipsys/weapon/laser.png
+++ b/core/assets/shipsys/weapon/laser.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/bar_weapon_minibox_glow.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/bar_weapon_minibox_glow.png