Merge remote-tracking branch 'origin/master'

2020-11-04 16:59:26 -08:00 · 2020-11-04 16:59:26 -08:00 · 5217e26ee3
parent 8decf3462d cfb897c70b
commit 5217e26ee3
30 changed files with 3 additions and 3 deletions
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
 # Zepha Voxel Game

-[![Codacy Rating](https://img.shields.io/codacy/grade/666016450e2645f7a88a2baea1a9f7fd.svg?logo=codacy)](https://app.codacy.com/app/Aurailus/Zepha?utm_source=github.com&utm_medium=referral&utm_content=Aurailus/Zeus_cpp&utm_campaign=Badge_Grade_Settings)
-[![Discord Badge](https://img.shields.io/discord/416379773976051712.svg?color=7289DA&label=discord&logo=discord&logoColor=white)](https://aurail.us/discord)
-[![GitHub Commit](https://img.shields.io/github/commit-activity/m/aurailus/zepha.svg?logo=github&label=commit%20activity)](https://github.com/Aurailus/Zepha/commits/master)
+[![codacy rating](https://img.shields.io/codacy/grade/8805f2cb1a454221ab70de77ec304f2d.svg?logo=codacy&labelColor=2A3037)](https://app.codacy.com/gh/Aurailus/Zepha)
+[![discord](https://img.shields.io/discord/416379773976051712.svg?color=7289DA&label=discord&logo=discord&logoColor=white&labelColor=2A3037)](https://aurail.us/discord)
+[![commit activity](https://img.shields.io/github/commit-activity/m/aurailus/zepha.svg?logo=github&labelColor=2A3037&label=commit%20activity)](https://github.com/Aurailus/Zepha/commits/master)

 ## About

--- a/assets/textures/menu/menu_flag_content.png
+++ b/assets/textures/menu/menu_flag_content.png
--- a/assets/textures/menu/menu_flag_multiplayer.png
+++ b/assets/textures/menu/menu_flag_multiplayer.png
--- a/assets/textures/menu/menu_flag_no.png
+++ b/assets/textures/menu/menu_flag_no.png
--- a/assets/textures/menu/menu_flag_quit.png
+++ b/assets/textures/menu/menu_flag_quit.png
--- a/assets/textures/menu/menu_flag_settings.png
+++ b/assets/textures/menu/menu_flag_settings.png
--- a/subgames/minimal/icon.png
+++ b/subgames/minimal/icon.png
--- a/subgames/parentheses/icon.png
+++ b/subgames/parentheses/icon.png
--- a/subgames/zeus/menu/textures/particle_group.png
+++ b/subgames/zeus/menu/textures/particle_group.png
--- a/subgames/zeus/menu/textures/zeus_background_christmas.png
+++ b/subgames/zeus/menu/textures/zeus_background_christmas.png
--- a/subgames/zeus/menu/textures/zeus_background_christmas_day.png
+++ b/subgames/zeus/menu/textures/zeus_background_christmas_day.png
--- a/subgames/zeus/menu/textures/zeus_background_christmas_night.png
+++ b/subgames/zeus/menu/textures/zeus_background_christmas_night.png
--- a/subgames/zeus/menu/textures/zeus_button.png
+++ b/subgames/zeus/menu/textures/zeus_button.png
--- a/subgames/zeus/menu/textures/zeus_button_extex.png
+++ b/subgames/zeus/menu/textures/zeus_button_extex.png
--- a/subgames/zeus/mods/aurailus_hot_wheel/textures/hot_wheel.png
+++ b/subgames/zeus/mods/aurailus_hot_wheel/textures/hot_wheel.png
--- a/subgames/zeus/mods/aurailus_hot_wheel/textures/hot_wheel_circle.png
+++ b/subgames/zeus/mods/aurailus_hot_wheel/textures/hot_wheel_circle.png
--- a/subgames/zeus/mods/zeus_default/textures/entity/mouse.png
+++ b/subgames/zeus/mods/zeus_default/textures/entity/mouse.png
--- a/subgames/zeus/mods/zeus_default/textures/entity/player.png
+++ b/subgames/zeus/mods/zeus_default/textures/entity/player.png
--- a/subgames/zeus/mods/zeus_default/textures/entity/raven.png
+++ b/subgames/zeus/mods/zeus_default/textures/entity/raven.png
--- a/subgames/zeus/mods/zeus_default/textures/entity/seagull.png
+++ b/subgames/zeus/mods/zeus_default/textures/entity/seagull.png
--- a/subgames/zeus/mods/zeus_default/textures/grass_side_ld.png
+++ b/subgames/zeus/mods/zeus_default/textures/grass_side_ld.png
--- a/subgames/zeus/mods/zeus_default/textures/leaves.png
+++ b/subgames/zeus/mods/zeus_default/textures/leaves.png
--- a/subgames/zeus/mods/zeus_default/textures/leaves_opaque.png
+++ b/subgames/zeus/mods/zeus_default/textures/leaves_opaque.png
--- a/subgames/zeus/mods/zeus_default/textures/leaves_puff.png
+++ b/subgames/zeus/mods/zeus_default/textures/leaves_puff.png
--- a/subgames/zeus/mods/zeus_default/textures/painting/16x_d1.png
+++ b/subgames/zeus/mods/zeus_default/textures/painting/16x_d1.png
--- a/subgames/zeus/mods/zeus_default/textures/stone.png
+++ b/subgames/zeus/mods/zeus_default/textures/stone.png
--- a/subgames/zeus/mods/zeus_inventory/textures/crafting.png
+++ b/subgames/zeus/mods/zeus_inventory/textures/crafting.png
--- a/subgames/zeus/mods/zeus_inventory/textures/inventory.png
+++ b/subgames/zeus/mods/zeus_inventory/textures/inventory.png
--- a/subgames/zeus/mods/zeus_inventory/textures/inventory_gridded.png
+++ b/subgames/zeus/mods/zeus_inventory/textures/inventory_gridded.png
--- a/subgames/zeus/mods/zeus_inventory/textures/inventory_wheel.png
+++ b/subgames/zeus/mods/zeus_inventory/textures/inventory_wheel.png