search

neos-modding-group / neos-mod-manifest

Central manifest for all known Neos VR mods
https://www.neosmodloader.com/mods
Creative Commons Zero v1.0 Universal
11 stars 36 forks source link

Add AudioClipWizard v1.0.0 #316

Closed Nytra closed 1 year ago

Nytra commented 1 year ago

Updated mod with changes from EIA485

EIA485 commented 1 year ago

since i already approved hash f846d313facedc1115da8ff492c56ab9cf152d8eedc017f3334cfb8128807f47 feel free to leave version 1.0.0. the reason i did not merge this is because there are conflicts that need manual resolving. maybe pr version 1.0.1 separately so a different reviewer can approve that one.

Nytra commented 1 year ago

But the only changes in v1.0.1 are the ones from your PR and a version number bump

Nytra commented 1 year ago

However I will revert back to v1.0.0 if you would like

EIA485 commented 1 year ago

for this pr revert to 1.0.0 and resolve conflicts. so i can merge it. after feel free to create a second pr for 1.0.1. i cant merge my own changes...

Nytra commented 1 year ago

Reverted to v1.0.0

Nytra commented 1 year ago

I don't know how to resolve conflicts though :/

EIA485 commented 1 year ago

version entry is still 1.0.1 one way to resolve conflicts is through the github web ui. on this page there is a button that says resolve conflicts pressing this will open a web editor where you can resolve the conflicts by fixing the overlapping json.

Nytra commented 1 year ago

Resolved conflicts. Hopefully I did it right :)

EIA485 commented 1 year ago

yep, perfect. sorry for all the hassle.