Noé Lopez f2b9d15373 Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/css/resources.scss # src/js/game/hud/parts/buildings_toolbar.js # src/js/game/meta_building_registry.js # src/js/game/systems/item_processor.js # translations/base-en.yaml		2020-09-23 18:49:45 +02:00
..
fonts	Minor artwork update	2020-05-11 14:21:59 +02:00
ui	Merge remote-tracking branch 'origin/master'	2020-09-23 18:49:45 +02:00
bg_render.webm	Add more tutorial videos	2020-05-23 13:02:02 +02:00
logo.png	Improve unlock notification	2020-05-23 10:30:54 +02:00