diff --git a/hacked-libtiled/tiled/io/TMXMapReader.java b/hacked-libtiled/tiled/io/TMXMapReader.java index 242c007..1e25783 100644 --- a/hacked-libtiled/tiled/io/TMXMapReader.java +++ b/hacked-libtiled/tiled/io/TMXMapReader.java @@ -821,8 +821,6 @@ public class TMXMapReader factory.setIgnoringComments(true); factory.setIgnoringElementContentWhitespace(true); factory.setExpandEntityReferences(false); - factory.setValidating(false); - factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); DocumentBuilder builder = factory.newDocumentBuilder(); builder.setEntityResolver(entityResolver); InputSource insrc = new InputSource(in); diff --git a/packaging/package.sh b/packaging/package.sh index 285e2ed..d68379e 100755 --- a/packaging/package.sh +++ b/packaging/package.sh @@ -98,10 +98,12 @@ if [ $? -ne 0 ]; then exit 1 fi -# --- Copy res folder to temp folder --- -cp "${ATCS_SOURCE_DIR}"/res/* "${TEMP_DIR}/" +# --- Copy res stuff to temp folder --- +cp -r "${ATCS_SOURCE_DIR}"/res/* "${TEMP_DIR}/" mkdir -p "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img" -cp -r "${ATCS_SOURCE_DIR}"/src/com/gpl/rpg/atcontentstudio/img/* "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img/" +mkdir -p "${TEMP_DIR}/tiled/io/resources/" +cp -r "${ATCS_SOURCE_DIR}"/src/com/gpl/rpg/atcontentstudio/img/* "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img/" # some icons +cp -r "${ATCS_SOURCE_DIR}"/hacked-libtiled/tiled/io/resources/* "${TEMP_DIR}/tiled/io/resources/" # dtd file for tmx maps # --- Create JAR file ---