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/statusUI/top_shieldsquare1_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_shieldsquare1_on.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_hull.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_hull.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_scrap.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_scrap.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_shields4_off.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/top_shields4_off.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/optionsUI/escape_continue_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/optionsUI/escape_continue_on.png
--- a/core/assets/inventory/inventory.png
+++ b/core/assets/inventory/inventory.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/dotted_line.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/dotted_line.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_diamond_circle.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_diamond_circle.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_boss.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_boss.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_ship.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_icon_ship.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/box_text_sectors.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/box_text_sectors.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_overlay.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/map/map_overlay.png
--- a/core/assets/options/escape_audio_on.png
+++ b/core/assets/options/escape_audio_on.png
--- a/core/assets/options/escape_back_on.png
+++ b/core/assets/options/escape_back_on.png
--- a/core/assets/options/escape_control_on.png
+++ b/core/assets/options/escape_control_on.png
--- a/core/assets/options/escape_credits_on.png
+++ b/core/assets/options/escape_credits_on.png
--- a/core/assets/options/escape_enable_on.png
+++ b/core/assets/options/escape_enable_on.png
--- a/core/assets/options/escape_general_on.png
+++ b/core/assets/options/escape_general_on.png
--- a/core/assets/options/escape_video_on.png
+++ b/core/assets/options/escape_video_on.png
--- a/core/assets/options/escape_window_on.png
+++ b/core/assets/options/escape_window_on.png