mirror of
https://github.com/pmret/papermario.git
synced 2024-11-08 12:02:30 +01:00
git subrepo pull --force tools/splat
subrepo: subdir: "tools/splat" merged: "e2b731ab1" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "e2b731ab1" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596"
This commit is contained in:
parent
4201a08a28
commit
195a99c796
@ -6,7 +6,7 @@
|
||||
[subrepo]
|
||||
remote = https://github.com/ethteck/splat.git
|
||||
branch = master
|
||||
commit = 42786d2a77813ab4aa9e34f010f0e783a4f336d9
|
||||
parent = 4141881c33fb386869a5cd512e9e19dc7f4cb683
|
||||
commit = e2b731ab198c1d8400412ffd09252deca65253d2
|
||||
parent = 4201a08a28b6d6f070b35f97e3ba726b5448893b
|
||||
method = merge
|
||||
cmdver = 0.4.3
|
||||
|
@ -280,7 +280,7 @@ def main(rom_path, config_path, repo_path, modes, verbose, ignore_cache=False):
|
||||
cache = {}
|
||||
|
||||
# Initialize segments
|
||||
all_segments = initialize_segments(options, config_path, config["segments"], platform)
|
||||
all_segments = initialize_segments(options, config_path, config["segments"])
|
||||
|
||||
for segment in all_segments:
|
||||
if platform == "n64" and type(segment) == N64SegCode: # remove special-case sometime
|
||||
|
Loading…
Reference in New Issue
Block a user