Merge branch 'master' into asm

# Conflicts:
#	build.gradle
#	src/main/java/cuchaz/enigma/bytecode/MethodParametersAttribute.java

1 files changed, 4 insertions, 0 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
index e5734a3a..7205fd56 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
@@ -71,6 +71,10 @@ public class MappingsTinyReader {
                                                 classMapping = classMappingMap.computeIfAbsent(parts[1], k -> new ClassMapping(parts[1]));
                                                 classMapping.addMethodMapping(readMethod(parts));
                                                 break;
+                                        case "MTH-ARG":
+                                                classMapping = classMappingMap.computeIfAbsent(parts[1], k -> new ClassMapping(parts[1]));
+                                                classMapping.setArgumentName(parts[3], new Signature(parts[2]), Integer.parseInt(parts[4]), parts[5]);
+                                                break;
                                         default:
                                                 throw new MappingParseException(file, lineNumber, "Unknown token '" + token + "' !");
                                 }