Attempting to fix stupid merge issue.

thebracket · May 27, 2017 · 4c4c990 · 4c4c990
2 parents 8be8061 + 4e1654b
commit 4c4c990
Show file tree

Hide file tree

Showing 185 changed files with 5,917 additions and 2,311 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Black Future
+# Nox Futura (formerly Black Future)
 
 An open-source game combining elements of Dwarf Fortress, Civilization, Warhammer, Douglass Adams, and more.
 

diff --git a/assets/background_image.jpg b/assets/background_image.jpg
diff --git a/assets/gamelogo.png b/assets/gamelogo.png
diff --git a/branding/nf_icon.png b/branding/nf_icon.png
diff --git a/branding/nf_icon.svg b/branding/nf_icon.svg
diff --git a/branding/nfdark.png b/branding/nfdark.png
diff --git a/branding/nfdark.svg b/branding/nfdark.svg
diff --git a/branding/nfwhite.png b/branding/nfwhite.png