Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.

This commit is contained in:
2019-04-06 14:00:33 -06:00
parent 6bbd852c8b
commit 3beb1ff33d
6 changed files with 415 additions and 406 deletions

3
.idea/encodings.xml generated
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/saves/playerSave.txt" charset="windows-1252" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>