Merge branch 'trader'

9621edad · Fabian · d735324c · e6874d37 · d735324c · 9621edad
Commit 9621edad authored 4 years ago by Fabian
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/scoreUI/gameover_victory_main.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/scoreUI/gameover_victory_main.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/buttons/FTL/FTL_JUMP.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/buttons/FTL/FTL_JUMP.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/ipad/systemUI/autofire_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/ipad/systemUI/autofire_on.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/storeUI/store_close_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/storeUI/store_close_on.png
--- a/core/assets/continue.png
+++ b/core/assets/continue.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/main_menus/continue_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/main_menus/continue_on.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/optionsUI/escape_mainmenu_on.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/optionsUI/escape_mainmenu_on.png
--- a/core/assets/crew/anaerobic.png
+++ b/core/assets/crew/anaerobic.png
--- a/core/assets/crew/battle.png
+++ b/core/assets/crew/battle.png
--- a/core/assets/crew/energy.png
+++ b/core/assets/crew/energy.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/people/health_box.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/people/health_box.png
--- a/core/assets/desktop.ini
+++ b/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
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/combatUI/box_hostiles_boss.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/combatUI/box_hostiles_boss.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/scoreUI/gameover_main.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/scoreUI/gameover_main.png
--- a/core/assets/event/eventbackground.png
+++ b/core/assets/event/eventbackground.png
--- a/core/assets/gameover/gameover_main.png
+++ b/core/assets/gameover/gameover_main.png
--- a/core/assets/gameover/victory_background.png
+++ b/core/assets/gameover/victory_background.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/box_weapons_bottom.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/box_weapons_bottom.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/energy_shield_bar.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/statusUI/energy_shield_bar.png
--- a/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/door_highlight.png
+++ b/Ressourcen/Rainmeter-skin/resources/game_data/img/effects/door_highlight.png