OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2025-12-29 15:55:37 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

Merge branch 'master' into git_integration

Browse Source 
Conflicts:
	.classpath
	src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
This commit is contained in:
Zukero
2018-09-28 09:48:36 +02:00
parent 6701d9784d 3e5f732f82
commit 547f76de33
66 changed files with 3504 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.classpath
View File

@@ -4,6 +4,7 @@
<classpathentry kind="src" path="res"/>
<classpathentry kind="src" path="hacked-libtiled"/>
<classpathentry kind="src" path="siphash-zackehh/src/main/java"/>
<classpathentry kind="src" path="minify"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_152"/>
<classpathentry kind="lib" path="lib/jide-oss.jar"/>
<classpathentry kind="lib" path="lib/json_simple-1.1.jar"/>
@@ -28,4 +29,4 @@
</classpathentry>
<classpathentry kind="lib" path="lib/JGit/slf4j-api-1.7.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
</classpath>