OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-21 19:08:30 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into stoutford_tests

Browse Source 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java
This commit is contained in:
Zukero
2017-01-20 16:56:27 +01:00
parent 6d77d8806b 322e176be9
commit fd21fd62ec
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java
View File

@@ -105,7 +105,6 @@ public final class JsonFieldNames {
public static final String iconID = "iconID";
public static final String name = "name";
public static final String spawnGroup = "spawnGroup";
// public static final String size = "size";
public static final String monsterClass = "monsterClass";
public static final String movementAggressionType = "movementAggressionType";
public static final String unique = "unique";