Merge branch 'develop'

Dylancyclone · Jul 9, 2020 · e303d62 · e303d62
2 parents c354e4e + 22922c7
commit e303d62
Show file tree

Hide file tree

Showing 10 changed files with 420 additions and 272 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Watch a demonstration video:
 
 From the root directory, run:
 
-`mvn package;java -jar ./target/VMF2OBJ-1.1.1-jar-with-dependencies.jar [VMF_FILE] [OUTPUT_FILE] [VPK_PATHS]`
+`mvn package;java -jar ./target/VMF2OBJ-1.1.2-jar-with-dependencies.jar [VMF_FILE] [OUTPUT_FILE] [VPK_PATHS]`
 
 ```
 usage: vmf2obj [VMF_FILE] [OUTPUT_FILE] [VPK_PATHS] [args...]

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,9 @@
+7/08/2020 1.1.2:
+* Massively improve conversion speed (up to 670% on large maps)
+* Fix Crowbar `DecompileFolderForEachModelIsChecked` setting causing issues
+* Improved exception reporting
+* The app will now print the version number at the beginning of the conversion process and at the top of generated files
+
 6/29/2020 1.1.1:
 * Fix displacements
 * Fix some models' QC being unfindable

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.lathrum.VMF2OBJ</groupId>
 	<artifactId>VMF2OBJ</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<packaging>jar</packaging>
 
 	<name>VMF2OBJ</name>
@@ -46,6 +46,10 @@
 					<include>**/*.exe</include>
 				</includes>
 			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
 		</resources>
 		<plugins>
 			<plugin>