Merge remote-tracking branch 'origin/Monster-Update-6' into nio_mustard

.gitignore

@@ -22,13 +22,13 @@ traceback.txt
 
 #Vim swap files
 .sw?
-
 *~
 *.bak
 
-#cache files
-#save files
+#save files & cache files
 /game/saves/
+/game/saves/*
+/game/cache/*
 /game/cache
 saves
 tmp
@@ -42,85 +42,15 @@ env
 *.pyc
 *.pyo
 
-styles.txt
+#Vim (best text editor) swap files
+.sw?
 
-/gui/game/gui
-/game/saves
+#binary files
+*.rpyc
+*.rpymc
 
-/android
-/build
-/dist
-/dists
-/renpy.app
-/jedit
-/lint.txt
-/renpy.code
-/*testing*
-/screenshot*
-/renpy.exe
-/renpy-32.exe
-/renpy.sh
-/lib
-/lib.old
-/lib2
-/lib3
-/doc
-/.pydevproject
-/.pydevproject.bak
-/.project
-/.cproject
-/.settings
-/LICENSE.txt
-/templates/english/README.html
-/the_question/README.html
-/tutorial/README.html
-/renpy/angle/*.pyx
-/renpy/angle/*.pxd
-/renpy-ppc.zip
-/module/build
-/module/gen*
-/editra
-/atom
-/launcher/game/theme
-/launcher/game/script_version.rpy
+#backups
+*.bak
 
-/dl
-renpy/vc_version.py
-.externalToolBuilders
-/rapt
-/evil
-/iaptest
-/pygame_sdl2
-/renios
-/steam_appid.txt
-/.coverage
-/id
-/ai
-/interface_7
-/htmlcov
-/the_question*/.android.json
-/WINDOWS.rst
-/old
-
-/*-all/
-/*-win/
-/*-mac/
-/*-linux*/
-/*-dists/
-doc-web
-
-sphinx/source/inc
-sphinx/source/thequestion.rst
-tutorial/game/tutorial_director.rpy
-launcher/theme
-module/emscripten-static/
-web/
-
-cubism
-glexperiment
-live2d
-rapt2
-rapt3
-renios2
-renios3
-notarized
+#android
+.android.json