diff options
| -rw-r--r-- | meta/model/forge.py | 2 | ||||
| -rw-r--r-- | meta/model/mojang.py | 2 | ||||
| -rwxr-xr-x | updateForge.py | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/model/forge.py b/meta/model/forge.py index 35af76b3ad..2db191b941 100644 --- a/meta/model/forge.py +++ b/meta/model/forge.py @@ -196,7 +196,7 @@ class ForgeVersion: self.changelog_url = None self.long_version = "%s-%s" % (self.mc_version, self.rawVersion) if self.branch is not None: - self.long_version = self.long_version + "-%s" % self.branch + self.long_version += "-%s" % self.branch # this comment's whole purpose is to say this: cringe for classifier, file in entry.files.items(): diff --git a/meta/model/mojang.py b/meta/model/mojang.py index e5ea072acd..468c372ad7 100644 --- a/meta/model/mojang.py +++ b/meta/model/mojang.py @@ -92,7 +92,7 @@ class LegacyOverrideEntry(MetaBase): if self.additional_traits: if not meta_version.additional_traits: meta_version.additional_traits = [] - meta_version.additional_traits = meta_version.additional_traits + self.additional_traits + meta_version.additional_traits += self.additional_traits if legacy: # remove all libraries - they are not needed for legacy diff --git a/updateForge.py b/updateForge.py index 4106bd8a8b..b459e636dc 100755 --- a/updateForge.py +++ b/updateForge.py @@ -87,14 +87,14 @@ def get_single_forge_files_manifest(longversion): pprint(classifier) pprint(extensionObj) print('%s: Skipping missing hash for extension %s:' % (longversion, extension)) - index = index + 1 + index += 1 continue assert type(classifier) == str processedHash = re.sub(r"\W", "", hash) if not len(processedHash) == 32: print('%s: Skipping invalid hash for extension %s:' % (longversion, extension)) pprint(extensionObj) - index = index + 1 + index += 1 continue fileObj = ForgeFile( @@ -104,8 +104,8 @@ def get_single_forge_files_manifest(longversion): ) if count == 0: retDict[classifier] = fileObj - index = index + 1 - count = count + 1 + index += 1 + count += 1 else: print('%s: Multiple objects detected for classifier %s:' % (longversion, classifier)) pprint(extensionObj) |