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

Merge branch 'dedupe'

Browse Source 
# Conflicts:
#	.idea/workspace.xml
#	src/ShipWarfareGUI.java
This commit is contained in:
Solargale
2019-04-07 12:48:37 -06:00
parent 5283b60c4f ca778137a5
commit 4e53d590a9
9 changed files with 178 additions and 324 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>

1
.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">
<file url="file://$PROJECT_DIR$/src/saves/playerSave.txt" charset="windows-1252" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>