RecentRunner/TaipanClone
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

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

Browse Source
This commit is contained in:
Solargale
2019-04-06 14:00:33 -06:00
parent 6bbd852c8b
commit 3beb1ff33d
6 changed files with 415 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/cssdialects.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CssDialectMappings">
<file url="file://$PROJECT_DIR$/src/styleguide.css" dialect="CLASSIC" />
</component>
</project>

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>

2
.idea/misc.xml generated
View File

@@ -9,7 +9,7 @@
<component name="ProjectKey">
<option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_201" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_141" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SvnBranchConfigurationManager">

802
.idea/workspace.xml generated
View File

File diff suppressed because it is too large Load Diff